Merge branch 'dev' into 'master'

More cleanups

See merge request !27

gpgkeys/FB4B18E6.txt

+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFC5a/0BEAD3LjUH329eJjBCdQ60m5wG9U/QToy/sEsx6+q/012wXPMFBMCW
+1h53ISj1uEyHd++qMn71u/GtWnRTwvPaxUUqdNiFQpTMAmY41JIdXmOzUYj9u3h/
+dLQJT7wKbKHQrfDnapT2O3eIyYuj07iPTtaIrUE8AZ/wVmrJ0xnLDeir2FfC3h3V
+mqFo7OAK193FdufYYT5YQlY4jJrgwo7KDjLEh9ZrB42Fj4+MXgjeX3K+gel/GwiS
+b/KahgB9bywUcstvDWoXfbhHmf0fw3SmRY+5B0wWp1un7uepsE+JJ69G4gwfgcln
+49JrYBGFdMBuvX6e3Dw5hUZ+rRtUn911qIO9uPR+SCJqf4ttzs9U0VSdLDUfFAv+
+Isb4WOXF8UF0QbN/Cl+EMs9eiN+MNCvYWRDcnsGTeEmIDhABqwfkrOXNpMHm1FNa
+P98QVc9TpBojes3KwmkTolAW92lgznYbpeN9nsv4BLT+hnBJGIegsgq78E1fa557
+l+am+qerljlHWapVB+107qdNBNxeOAUA6DdXH9B6XZju1+M4kjYrtzKraUCUMZZ9
+JebOKMerF++fjdSqmJM8LbNIwcfDtqBqMBBrbiIhlysiFBIItBOK+KCOQ+s95had
+J/kFbo1doFUc+k4+ltMwsQGhRoWeSpr3Xl5ohGCnF9k9PwnlBzGx8I+xWwARAQAB
+tCZGZWRvcmEgKDE5KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCULlr/QIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQB0d+ZftLGOYR
+mA/+KAam9+c6wmJauLOY5dHMxd5UxsfPz3YsTKNLVDwt/ohRze4hXcH/Wt4bOfk8
+FSO35xzP4ynXpUZDfrDJsz4QNOpGTIyQCJdCHr8n+RR6IDMSVF9e8uOMoCfwE/Nw
+erLD4KGI6S1+bffcEA6YTxQod+4WMEJlkLToTfEBtxksxGMoW3xdwINDT13jQivm
+zktoGbOQE6zSSNVaaA94xSw5AbiYXUqfIvvJBmCPeM89ctTC5tTyNsQAN8n0QJtD
+lKT3hPfT8H4gacqiecXBJ6fpuWMXY4t044JBPmOk5Nlr0TEJ3m0jmPc1A6f+h+/Y
+flBLVIGx+Bw+LIrfxAfrn03XLyleDEO9kvC7q1zxnezKdcxtVXfI5bDQZELWMT1b
+KVQvje3KuEZ0IrRwV3qKKucBNqd0k2F6O0ovLMorenLMyBl9SDpOWt67roJeANiq
+BFFJkNuDqBtHgzgY7053Lj7VMoIeOtBpRf6WM7m8MaI0gXTgjZrhPPynqdFmDtvd
+6IqBYVFvUgIqPM36Scev2CMpok/g8KBzaHKljim+xSI4wziu3Kfxb854P/Df9WZd
+bCDWpFdPY5/dCnoMgTHGKLUumUMlfXif+fEykNt4Ic9Fibkzv+QSHQ5YYtoTfp9i
+o7puEJiQxkQsuX/CcXU9NDL6MeBBNS/b67EqnObAIRzroHY=
+=apZ8
+-----END PGP PUBLIC KEY BLOCK-----

prod.repos.d/centos-7-source.repo

@@ -60,24 +60,3 @@ baseurl=http://vault.centos.org/centos/7/sclo/Source/sclo/
 enabled=1
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-[centossource-7-cloud-openstack-liberty]
-name=centossource-7-cloud-openstack-liberty
-baseurl=http://vault.centos.org/centos/7/cloud/Source/openstack-liberty/
-enabled=1
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-[centossource-7-cloud-openstack-mitaka]
-name=centossource-7-cloud-openstack-mitaka
-baseurl=http://vault.centos.org/centos/7/cloud/Source/openstack-mitaka/
-enabled=1
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-
-[centossource-7-cloud-openstack-kilo]
-name=centossource-7-cloud-openstack-kilo
-baseurl=http://vault.centos.org/centos/7/cloud/Source/openstack-kilo/
-enabled=1
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7

prod.repos.d/pgpool.repo

@@ -9,8 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGPOOL2
 name=pgpool-II 3.5 for EL7 x86_64 - Source
 baseurl=http://www.pgpool.net/yum/srpms/3.5/redhat/rhel-7-x86_64/
 enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGPOOL2
+gpgcheck=0
 
 [pgpool35-el6-x86_64]
 name=pgpool-II 3.5 for EL6 x86_64
@@ -23,5 +22,4 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGPOOL2
 name=pgpool-II 3.5 for EL6 x86_64 - Source
 baseurl=http://www.pgpool.net/yum/srpms/3.5/redhat/rhel-6-x86_64/
 enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGPOOL2
+gpgcheck=0

prod.repos.d/redhat-6-ev-x86_64.repo

@@ -128,7 +128,7 @@ enabled = 1
 [rhel-6-server-x86_64-rhv-4-agent-rpms]
 name = Red Hat Virtualization 4 Agents for RHEL 6 Server (RPMs)
 baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/rhv-agent/4/os
-sslclientcert = /certs/8a85f9825cc471b3015cc47ecc80054c.pem
+sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
 sslcacert = /certs/redhat-uep.pem
 enabled = 1
 

prod.repos.d/redhat-6-loadbalancer-i386.repo

-[rhel-6-server-i386-loadbalancer-source-rpms]
-name    = Red Enterprise Linux Load Balancer (Source RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/i386/loadbalancer/source/SRPMS
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-6-server-i386-loadbalancer-debug-rpms]
-name    = Red Enterprise Linux Load Balancer (Debug RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/i386/loadbalancer/debug
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-6-server-i386-loadbalancer-rpms]
-name    = Red Enterprise Linux Load Balancer (RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/i386/loadbalancer/os
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1

prod.repos.d/redhat-6-loadbalancer-x86_64.repo

-[rhel-6-server-x86_64-loadbalancer-source-rpms]
-name    = Red Enterprise Linux Load Balancer (Source RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/loadbalancer/source/SRPMS
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-6-server-x86_64-loadbalancer-debug-rpms]
-name    = Red Enterprise Linux Load Balancer (Debug RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/loadbalancer/debug
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-6-server-x86_64-loadbalancer-rpms]
-name    = Red Enterprise Linux Load Balancer (RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/6/6Server/x86_64/loadbalancer/os
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1

prod.repos.d/redhat-7-loadbalancer-x86_64.repo

-[rhel-7-server-x86_64-loadbalancer-source-rpms]
-name    = Red Enterprise Linux Load Balancer (Source RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/loadbalancer/source/SRPMS
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-7-server-x86_64-loadbalancer-debug-rpms]
-name    = Red Enterprise Linux Load Balancer (Debug RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/loadbalancer/debug
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1
-
-[rhel-7-server-x86_64-loadbalancer-rpms]
-name    = Red Enterprise Linux Load Balancer (RPMs)
-baseurl = https://cdn.redhat.com/content/dist/rhel/server/7/7Server/x86_64/loadbalancer/os
-sslclientcert = /certs/8a85f9875993915c015993b8460b1956.pem
-sslcacert = /certs/redhat-uep.pem
-enabled = 1

prod.repos.d/rsyslog.repo

@@ -2,14 +2,13 @@
 name=Adiscon Rsyslog v8-stable for CentOS-7-x86_64
 baseurl=http://rpms.adiscon.com/v8-stable/epel-7/x86_64/
 enabled=1
-gpgcheck=1
+gpgcheck=0
 
 [rsyslog-v8-stable-centos6-x86_64]
 name=Adiscon Rsyslog v8-stable for CentOS-6-x86_64
 baseurl=http://rpms.adiscon.com/v8-stable/epel-6/x86_64/
 enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Adiscon
+gpgcheck=0
 
 [rsyslog-v8-stable-centos6-i386]
 name=Adiscon Rsyslog v8-stable for CentOS-6-x86_64

prod.repos.d/zfs.repo

@@ -42,8 +42,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux
 name=ZFS on Linux for EL7 - Source
 baseurl=http://download.zfsonlinux.org/epel/7/SRPMS/
 enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux
+gpgcheck=0
 
 [zfs-kmod-el7-x86_64]
 name=ZFS on Linux for EL 7 (KMOD)