summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Runge <mrunge@redhat.com>2017-03-23 11:52:55 +0100
committerMatthias Runge <mrunge@redhat.com>2017-03-23 11:52:55 +0100
commitbc8afcc8005a3bdf696f998b9240c7cad308d00b (patch)
tree7b41969c7d2e286d34750a4a4534a63da2426a3c
parent4e1be5592802035403ae5c8595d97baeac9f729a (diff)
drop dependency on openstack packages
- sending other changes for review: - RPM GPG key added - enabled "official" repos from mirror Change-Id: I421c90ca6518cff3497ff847bcd5b7cd82c2b042
-rw-r--r--CentOS-OpsTools.repo17
-rw-r--r--RPM-GPG-KEY-CentOS-SIG-OpsTools20
-rw-r--r--centos-release-opstools.spec16
3 files changed, 36 insertions, 17 deletions
diff --git a/CentOS-OpsTools.repo b/CentOS-OpsTools.repo
index bff43da..a924551 100644
--- a/CentOS-OpsTools.repo
+++ b/CentOS-OpsTools.repo
@@ -7,19 +7,12 @@
name=CentOS-7 - OpsTools - testing repo
baseurl=http://buildlogs.centos.org/centos/7/opstools/$basearch/
gpgcheck=0
-enabled=1
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
-#
-[centos-opstools-logging]
-name=CentOS-7 - OpsTools - logging testing repo
-baseurl=http://cbs.centos.org/repos/opstools7-elastic-common-testing/$basearch/os/
-gpgcheck=0
-enabled=1
+enabled=0
-[centos-opstools-release]
+[centos-release-opstools]
name=CentOS-7 - OpsTools - release
-baseurl=https://mirror.centos.org/centos/$releasever/opstools/$basearch/
-gpgcheck=0
+baseurl=http://mirror.centos.org/centos/$releasever/opstools/$basearch/
+gpgcheck=1
enabled=1
skip_if_unavailable=1
-# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
diff --git a/RPM-GPG-KEY-CentOS-SIG-OpsTools b/RPM-GPG-KEY-CentOS-SIG-OpsTools
new file mode 100644
index 0000000..4196e35
--- /dev/null
+++ b/RPM-GPG-KEY-CentOS-SIG-OpsTools
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQENBFirSnoBCADLACfDHfVhgxMImHt7Y6VpUAvg/QXygfvkhmzbcvVTzj0EvP98
+V9H+O0+lWupQCoa9J5p/7i5bF74aWqY6KZU9tQnU8Mc+nbyvy63TC4Jb47c9AwPo
+Nba3CCmnQs+pfNTbvpwR72akgyx1jCWQApYoo5O0MKQy23Zhm8jz8DoPyOjRSrlV
+idRUGLoydLU7u4sC+LiNfl5LoAZ1KygeOK1zHh3ADQTuMdLFMizb19fIhENyN2xm
+sfqTW1UZi4R/1s2e/smZtf3P1N9lAwRvWYxy0IeXJXyZpT18nuyXqp1N1Xivcs2r
+PW0tpY5Fn2/hauKeJP5DbqEo7o7XAAyy+NUbABEBAAG0YUNlbnRPUyBPcHNUb29s
+cyBTSUcgKGh0dHBzOi8vd2lraS5jZW50b3Mub3JnL1NwZWNpYWxJbnRlcmVzdEdy
+b3VwL09wc1Rvb2xzKSA8c2VjdXJpdHlAY2VudG9zLm9yZz6JATkEEwECACMFAlir
+SnoCGwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRBP2VMnUbwqE6GSB/9r
+ViXDUqDAA6xy5TxGZv+JGxFNxRN+srhBLsUeK/DL//kFuONpN+t662V6J1/odP3x
+Ho7gE08RJvo8V+QNjfswzseqeVl0texuX9/QNjAbatDFW5GW4w4wFDB9yM1C9GtQ
+HZqmNmuP9ZM9smH6uFCVFDhPCAT5uoW+iedJWSjrwHAwfu3nuWMNHX0H1IYAf4Kp
+lstDehI0ydMhCEkajBe67M9sdMTfLL0vfnvFzjk4eDdBKrC/aaUYHfLwlBn5zC9W
+WaM0qP0zkSYT4C301LsRtYkUDCv4JgojgPZX0lea0fXaEzE5qps+gNFsklNVKhFo
+vb7nW8WM0/YHt3XqFILq
+=R48J
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/centos-release-opstools.spec b/centos-release-opstools.spec
index 6be98f3..10e9af4 100644
--- a/centos-release-opstools.spec
+++ b/centos-release-opstools.spec
@@ -1,15 +1,15 @@
Summary: Config to enable the repository for OpsTools SIG
Name: centos-release-opstools
Version: 1
-Release: 5%{?dist}
+Release: 7%{?dist}
License: GPL
URL: http://wiki.centos.org/SpecialInterestGroup/OpsTools
Source0: CentOS-OpsTools.repo
+Source1: RPM-GPG-KEY-CentOS-SIG-OpsTools
BuildArch: noarch
Requires: centos-release
-Requires: centos-release-openstack-newton
%description
yum configs for CentOS OpsTools SIG.
@@ -18,15 +18,21 @@ yum configs for CentOS OpsTools SIG.
%install
install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-OpsTools.repo
-#install -p -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-#install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -p -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
%files
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
-#%{_sysconfdir}/pki/rpm-gpg
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools
%changelog
+* Thu Mar 23 2017 Matthias Runge <mrunge@redhat.com> - 1.7
+- drop dependency on centos-openstack repos
+
+* Fri Feb 24 2017 Matthias Runge <mrunge@redhat.com> - 1.6
+- add gpg key for CentOS SIG OpsTools
+
* Wed Jan 25 2017 Matthias Runge <mrunge@redhat.com> - 1.5
- add opstools-release repo