From d0cbd50119ebd5daa954069fa7395084f0604bd96d7d41249f0b10e8a5e471e1 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 10 Jun 2019 10:11:24 +0000 Subject: [PATCH 1/4] Accepting request 708945 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708945 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=43 --- ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz | 3 --- ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz | 3 +++ ceph-iscsi.changes | 7 +++++++ ceph-iscsi.spec | 10 ++++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz create mode 100644 ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz diff --git a/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz b/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz deleted file mode 100644 index a4e9b7c..0000000 --- a/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c9f95a54539284db25ceeee766df1a8bd1adf5412c3e08e4c7d6c7e004b3b7 -size 128686 diff --git a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz new file mode 100644 index 0000000..af95e0f --- /dev/null +++ b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77472deeb9b3cd112cae9fecf267c9230d0279273e7fa902ed3030228cc0715b +size 128344 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index a540c86..8384a8b 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler + +- Update to 3.0+1560161410.g38e3c92: + + Remove config hash check validation + + spec: fix fedora/rhel conditional blocks + ------------------------------------------------------------------- Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index 558ce40..a2bb531 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1559837868.g8be74cf +Version: 3.0+1560161410.g38e3c92 Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -72,7 +72,7 @@ Requires: python3-configshell >= 1.1.fb23 %endif %endif -%if 0%{?rhel} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: systemd %else BuildRequires: systemd-rpm-macros @@ -144,6 +144,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %endif %post +%if 0%{?fedora} || 0%{?rhel} %if 0%{?rhel} < 8 /bin/systemctl --system daemon-reload &> /dev/null || : /bin/systemctl --system enable rbd-target-gw &> /dev/null || : @@ -153,20 +154,24 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %systemd_post rbd-target-gw.service %systemd_post rbd-target-api.service %endif +%endif %if 0%{?suse_version} %service_add_post rbd-target-gw.service rbd-target-api.service %endif %preun +%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_preun rbd-target-gw.service %systemd_preun rbd-target-api.service %endif +%endif %if 0%{?suse_version} %service_del_preun rbd-target-gw.service rbd-target-api.service %endif %postun +%if 0%{?fedora} || 0%{?rhel} %if 0%{?rhel} < 8 /bin/systemctl --system daemon-reload &> /dev/null || : %endif @@ -174,6 +179,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %systemd_postun rbd-target-gw.service %systemd_postun rbd-target-api.service %endif +%endif %if 0%{?suse_version} %service_del_postun rbd-target-gw.service rbd-target-api.service %endif From 09b6fdca959a42395a97bfcd4cc8ebdde27c669eb5a24ce0864822ff0997461a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 10 Jun 2019 15:31:54 +0000 Subject: [PATCH 2/4] Accepting request 708984 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708984 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=44 --- ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz | 3 --- ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz | 3 +++ ceph-iscsi.changes | 4 ++-- ceph-iscsi.spec | 14 ++++---------- 4 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz create mode 100644 ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz diff --git a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz b/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz deleted file mode 100644 index af95e0f..0000000 --- a/ceph-iscsi-3.0+1560161410.g38e3c92.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77472deeb9b3cd112cae9fecf267c9230d0279273e7fa902ed3030228cc0715b -size 128344 diff --git a/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz b/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz new file mode 100644 index 0000000..797c6b9 --- /dev/null +++ b/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b98192b983ac85c258a6c2a72e85aa1655031dc1a6ab7a593e70c6f6546221f +size 128313 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 8384a8b..d5da94f 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler -- Update to 3.0+1560161410.g38e3c92: +- Update to 3.0+1560180583.g6a2109b: + Remove config hash check validation - + spec: fix fedora/rhel conditional blocks + + spec: fix rhel conditional blocks ------------------------------------------------------------------- Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index a2bb531..c8dd044 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1560161410.g38e3c92 +Version: 3.0+1560180583.g6a2109b Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -72,7 +72,7 @@ Requires: python3-configshell >= 1.1.fb23 %endif %endif -%if 0%{?rhel} && 0%{?rhel} < 8 +%if 0%{?rhel} == 7 BuildRequires: systemd %else BuildRequires: systemd-rpm-macros @@ -144,8 +144,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %endif %post -%if 0%{?fedora} || 0%{?rhel} -%if 0%{?rhel} < 8 +%if 0%{?rhel} == 7 /bin/systemctl --system daemon-reload &> /dev/null || : /bin/systemctl --system enable rbd-target-gw &> /dev/null || : /bin/systemctl --system enable rbd-target-api &> /dev/null || : @@ -154,32 +153,27 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %systemd_post rbd-target-gw.service %systemd_post rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_add_post rbd-target-gw.service rbd-target-api.service %endif %preun -%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_preun rbd-target-gw.service %systemd_preun rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_del_preun rbd-target-gw.service rbd-target-api.service %endif %postun -%if 0%{?fedora} || 0%{?rhel} -%if 0%{?rhel} < 8 +%if 0%{?rhel} == 7 /bin/systemctl --system daemon-reload &> /dev/null || : %endif %if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_postun rbd-target-gw.service %systemd_postun rbd-target-api.service %endif -%endif %if 0%{?suse_version} %service_del_postun rbd-target-gw.service rbd-target-api.service %endif From 3ebf8284d311750d92040a66db2e79733658f1755a1188de7662cbbd798e61bd Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 10 Jun 2019 15:40:52 +0000 Subject: [PATCH 3/4] Accepting request 708986 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708986 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=45 --- ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz | 3 --- ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz | 3 +++ ceph-iscsi.changes | 6 +++--- ceph-iscsi.spec | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz create mode 100644 ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz diff --git a/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz b/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz deleted file mode 100644 index 797c6b9..0000000 --- a/ceph-iscsi-3.0+1560180583.g6a2109b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b98192b983ac85c258a6c2a72e85aa1655031dc1a6ab7a593e70c6f6546221f -size 128313 diff --git a/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz b/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz new file mode 100644 index 0000000..0c4669e --- /dev/null +++ b/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d97ed12ce9b01c2952b29b24fc7d57844ff27fe9d57e83dc4e76b54c786d568 +size 128700 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index d5da94f..6f8b1c8 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Mon Jun 10 10:10:27 UTC 2019 - Nathan Cutler +Mon Jun 10 15:39:27 UTC 2019 - Nathan Cutler -- Update to 3.0+1560180583.g6a2109b: - + Remove config hash check validation +- Update to 3.0+1560181178.g3010fd7: + + Fix config hash check validation + spec: fix rhel conditional blocks ------------------------------------------------------------------- diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index c8dd044..1930715 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1560180583.g6a2109b +Version: 3.0+1560181178.g3010fd7 Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management From 5ca2e678c452b5e1aeb3e558f595ffa244878862dc337f46b5af520ae6807575 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 11 Jun 2019 10:37:25 +0000 Subject: [PATCH 4/4] Accepting request 709110 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/709110 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=46 --- ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz | 3 --- ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz | 3 +++ ceph-iscsi.changes | 6 ++++++ ceph-iscsi.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz create mode 100644 ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz diff --git a/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz b/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz deleted file mode 100644 index 0c4669e..0000000 --- a/ceph-iscsi-3.0+1560181178.g3010fd7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d97ed12ce9b01c2952b29b24fc7d57844ff27fe9d57e83dc4e76b54c786d568 -size 128700 diff --git a/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz b/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz new file mode 100644 index 0000000..a519215 --- /dev/null +++ b/ceph-iscsi-3.0+1560249372.g70ec7a9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9f140c339238b57b6a3f6307fd19462e3cf31eda6a4224da39e8821bf60023d +size 128571 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 6f8b1c8..c92fbda 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 11 10:36:22 UTC 2019 - Nathan Cutler + +- Update to 3.0+1560249372.g70ec7a9: + + spec: drop python3-configshell-fb version guard + ------------------------------------------------------------------- Mon Jun 10 15:39:27 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index 1930715..0f6deb7 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1560181178.g3010fd7 +Version: 3.0+1560249372.g70ec7a9 Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -51,7 +51,7 @@ Requires: python-rtslib >= 2.1.fb67 Requires: rpm-python >= 4.11 Requires: python-cryptography Requires: python-flask >= 0.10.1 -Requires: python-configshell >= 1.1.fb23 +Requires: python-configshell %else BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -65,10 +65,10 @@ Requires: python3-rpm >= 4.11 BuildRequires: python-rpm-macros BuildRequires: fdupes Requires: python3-Flask >= 0.10.1 -Requires: python3-configshell-fb >= 1.1.23 +Requires: python3-configshell-fb %else Requires: python3-flask >= 0.10.1 -Requires: python3-configshell >= 1.1.fb23 +Requires: python3-configshell %endif %endif