From 95a8c378c0de67241e9e681c54f46656f819f4c0fa02474c7c164936aa99b6c7 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 6 Jun 2019 16:20:43 +0000 Subject: [PATCH 1/3] Accepting request 708171 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708171 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=39 --- ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz | 3 --- ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz | 3 +++ ceph-iscsi.changes | 10 ++++---- ceph-iscsi.spec | 28 ++++++++++++++++------- 4 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz create mode 100644 ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz diff --git a/ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz b/ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz deleted file mode 100644 index d086c3b..0000000 --- a/ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bffcc8ba1ff8399dfdcce8b065ef8a1cc928503323a2a8f8485e76489c09411 -size 128634 diff --git a/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz b/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz new file mode 100644 index 0000000..a4e9b7c --- /dev/null +++ b/ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94c9f95a54539284db25ceeee766df1a8bd1adf5412c3e08e4c7d6c7e004b3b7 +size 128686 diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 872ef0c..dc77fb9 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,13 +1,15 @@ ------------------------------------------------------------------- -Thu Jun 6 10:04:00 UTC 2019 - Nathan Cutler +Thu Jun 6 18:18:00 UTC 2019 - Nathan Cutler -- Update to 3.0+1559815396.g7aa8f7f: +- Update to 3.0+1559837868.g8be74cf: + Set 'SUSE' SCSI vendor (bsc#1136769) + Adds support for multiple IPs per gateway (bsc#1136757) - + Do not allow lrbd to be installed simultaneously with ceph-iscsi - + Temporary workaround to support ',' in configshell params (must be removed/reverted in the future, after configshell >= 1.1.f25 is available) + + Temporary workaround to support ',' in configshell params (must be + removed/reverted in the future, after configshell >= 1.1.f25 is available) + Fix problem deleting target with clients/disks + Removes the disk 'delete' command + + spec: conflict with lrbd <= 3.0 to ensure lrbd is not installed + simultaneously with ceph-iscsi ------------------------------------------------------------------- Tue May 21 19:09:22 UTC 2019 - Nathan Cutler diff --git a/ceph-iscsi.spec b/ceph-iscsi.spec index 7738011..558ce40 100644 --- a/ceph-iscsi.spec +++ b/ceph-iscsi.spec @@ -20,7 +20,7 @@ Name: ceph-iscsi -Version: 3.0+1559815396.g7aa8f7f +Version: 3.0+1559837868.g8be74cf Release: 1%{?dist} Group: System/Filesystems Summary: Python modules for Ceph iSCSI gateway configuration management @@ -72,12 +72,16 @@ Requires: python3-configshell >= 1.1.fb23 %endif %endif -%if 0%{?suse_version} -Conflicts: lrbd -%endif - +%if 0%{?rhel} < 8 +BuildRequires: systemd +%else BuildRequires: systemd-rpm-macros %{?systemd_requires} +%endif + +%if 0%{?suse_version} +Conflicts: lrbd < 3.0 +%endif %description Python package providing the modules used to handle the configuration of an @@ -140,7 +144,12 @@ 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 || : +/bin/systemctl --system enable rbd-target-api &> /dev/null || : +%endif +%if 0%{?fedora} || 0%{?rhel} >= 8 %systemd_post rbd-target-gw.service %systemd_post rbd-target-api.service %endif @@ -149,7 +158,7 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %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 @@ -158,7 +167,10 @@ ln -s service %{buildroot}%{_sbindir}/rcrbd-target-api %endif %postun -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} < 8 +/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 From ea38f4238b14bc3a51fab064e55cf70c66923906f8fadb6890668aa039873c9c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 6 Jun 2019 16:23:33 +0000 Subject: [PATCH 2/3] Accepting request 708173 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708173 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=40 --- ceph-iscsi.changes | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index dc77fb9..561b460 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -2,14 +2,19 @@ Thu Jun 6 18:18:00 UTC 2019 - Nathan Cutler - Update to 3.0+1559837868.g8be74cf: + + spec: conflict only with lrbd <= 3.0 to ensure lrbd is not installed + simultaneously with ceph-iscsi + +------------------------------------------------------------------- +Thu Jun 6 10:04:00 UTC 2019 - Nathan Cutler + +- Update to 3.0+1559815396.g7aa8f7f: + Set 'SUSE' SCSI vendor (bsc#1136769) + Adds support for multiple IPs per gateway (bsc#1136757) - + Temporary workaround to support ',' in configshell params (must be - removed/reverted in the future, after configshell >= 1.1.f25 is available) + + Do not allow lrbd to be installed simultaneously with ceph-iscsi + + Temporary workaround to support ',' in configshell params (must be removed/reverted in the future, after configshell >= 1.1.f25 is available) + Fix problem deleting target with clients/disks + Removes the disk 'delete' command - + spec: conflict with lrbd <= 3.0 to ensure lrbd is not installed - simultaneously with ceph-iscsi ------------------------------------------------------------------- Tue May 21 19:09:22 UTC 2019 - Nathan Cutler From 1ab264d5e0a169aef6dbf6f03a261142a04f088b053bbfb6239c1eac62f6dfd3 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 6 Jun 2019 16:26:10 +0000 Subject: [PATCH 3/3] Accepting request 708175 from filesystems:ceph:nautilus M17 candidate OBS-URL: https://build.opensuse.org/request/show/708175 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph-iscsi?expand=0&rev=41 --- ceph-iscsi.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-iscsi.changes b/ceph-iscsi.changes index 561b460..a540c86 100644 --- a/ceph-iscsi.changes +++ b/ceph-iscsi.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Jun 6 18:18:00 UTC 2019 - Nathan Cutler +Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler - Update to 3.0+1559837868.g8be74cf: + spec: conflict only with lrbd <= 3.0 to ensure lrbd is not installed @@ -7,7 +7,7 @@ Thu Jun 6 18:18:00 UTC 2019 - Nathan Cutler ------------------------------------------------------------------- Thu Jun 6 10:04:00 UTC 2019 - Nathan Cutler - + - Update to 3.0+1559815396.g7aa8f7f: + Set 'SUSE' SCSI vendor (bsc#1136769) + Adds support for multiple IPs per gateway (bsc#1136757)