Hello community,
here is the log from the commit of package ceph-iscsi for openSUSE:Factory
checked in at 2019-06-07 12:19:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph-iscsi (Old)
and /work/SRC/openSUSE:Factory/.ceph-iscsi.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph-iscsi"
Fri Jun 7 12:19:11 2019 rev:14 rq:708176 version:3.0+1559837868.g8be74cf
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph-iscsi/ceph-iscsi.changes 2019-06-06
18:19:24.168649475 +0200
+++ /work/SRC/openSUSE:Factory/.ceph-iscsi.new.4811/ceph-iscsi.changes
2019-06-07 12:19:11.752774635 +0200
@@ -1,0 +2,7 @@
+Thu Jun 6 16:25:29 UTC 2019 - Nathan Cutler <ncut...@suse.com>
+
+- Update to 3.0+1559837868.g8be74cf:
+ + spec: conflict only with lrbd <= 3.0 to ensure lrbd is not installed
+ simultaneously with ceph-iscsi
+
+-------------------------------------------------------------------
Old:
----
ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz
New:
----
ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-iscsi.spec ++++++
--- /var/tmp/diff_new_pack.PqlQkM/_old 2019-06-07 12:19:12.260774474 +0200
+++ /var/tmp/diff_new_pack.PqlQkM/_new 2019-06-07 12:19:12.268774471 +0200
@@ -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 @@
%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 @@
%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 @@
%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 @@
%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
++++++ ceph-iscsi-3.0+1559815396.g7aa8f7f.tar.gz ->
ceph-iscsi-3.0+1559837868.g8be74cf.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ceph-iscsi-3.0+1559815396.g7aa8f7f/README
new/ceph-iscsi-3.0+1559837868.g8be74cf/README
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/README 2019-06-06
12:03:16.056678443 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/README 2019-06-06
18:17:48.162326785 +0200
@@ -22,13 +22,16 @@
| | o- rbd ....................................... [(x3), Commit: 8G/20G
(40%), Used: 5K]
| o- topology .........................................................
[OSDs: 3,MONs: 3]
o- disks ...................................................................
[8G, Disks: 5]
- | o- rbd.disk_1
............................................................. [disk_1 (1G)]
- | o- rbd.disk_2
............................................................. [disk_2 (2G)]
- | o- rbd.disk_3
............................................................. [disk_3 (2G)]
- | o- rbd.disk_4
............................................................. [disk_4 (1G)]
- | o- rbd.disk_5
............................................................. [disk_5 (2G)]
- o- iscsi-target
.............................................................. [Targets: 1]
+ | o- rbd
....................................................................... [rbd
(8G)]
+ | o- disk_1
............................................................... [disk_1 (1G)]
+ | o- disk_2
............................................................... [disk_2 (2G)]
+ | o- disk_3
............................................................... [disk_3 (2G)]
+ | o- disk_4
............................................................... [disk_4 (1G)]
+ | o- disk_5
............................................................... [disk_5 (2G)]
+ o- iscsi-targets
............................................................. [Targets: 1]
o- iqn.2003-01.com.redhat.iscsi-gw:ceph-gw
................................ [Gateways: 2]
+ o- disks
................................................................... [Disks: 1]
+ | o- rbd/disk_1 ......................................................
[Owner: rh7-gw1]
o- gateways ..................................................... [Up:
2/2, Portals: 2]
| o- rh7-gw1 ....................................................
[192.168.122.69 (UP)]
| o- rh7-gw2 ...................................................
[192.168.122.104 (UP)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ceph-iscsi-3.0+1559815396.g7aa8f7f/ceph-iscsi.spec
new/ceph-iscsi-3.0+1559837868.g8be74cf/ceph-iscsi.spec
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/ceph-iscsi.spec 2019-06-06
12:03:16.636671848 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/ceph-iscsi.spec 2019-06-06
18:17:48.750324892 +0200
@@ -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 @@
%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 @@
%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 @@
%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 @@
%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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli/hostgroup.py
new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli/hostgroup.py
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli/hostgroup.py 2019-06-06
12:03:16.068678307 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli/hostgroup.py 2019-06-06
18:17:48.170326759 +0200
@@ -183,7 +183,7 @@
e.g.
host add|remove iqn.1994-05.com.redhat:rh7-client
- disk add|remove rbd.disk_1
+ disk add|remove rbd/disk_1
'''
valid_actions = ['add', 'remove']
@@ -286,7 +286,7 @@
operation will be executed across all hosts defined to the host group.
e.g.
- disk add|remove rbd.disk_1
+ disk add|remove rbd/disk_1
"""
if action not in HostGroup.valid_actions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli/storage.py
new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli/storage.py
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli/storage.py 2019-06-06
12:03:16.068678307 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli/storage.py 2019-06-06
18:17:48.170326759 +0200
@@ -459,10 +459,10 @@
> detach <disk_name>
e.g.
- > detach rbd.disk_1
+ > detach rbd/disk_1
"disk_name" refers to the name of the disk as shown in the UI, for
- example rbd.disk_1.
+ example rbd/disk_1.
"""
self.delete_disk(image_id, True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli.8
new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli.8
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/gwcli.8 2019-06-06
12:03:16.064678352 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/gwcli.8 2019-06-06
18:17:48.170326759 +0200
@@ -212,7 +212,7 @@
\fB>/iscsi-target..eph-igw/hosts> cd iqn.1994-05.com.redhat:rh7-client\fR
.PP
.TP
-\fB>disk add rbd.disk_1
+\fB>disk add rbd/disk_1
The first command navigates to the client's entry in the UI at which point the
\fBdisk\fR or \fBauth\fR sub-commands may be used. In this example the disk
subcommand is used to mask \fIdisk_1\fR in the \fIrbd\fR pool to the iSCSI
client. The LUN id associated with this device is automatically assigned and
maintained by the system.
.PD 1
.SH OTHER COMMANDS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ceph-iscsi-3.0+1559815396.g7aa8f7f/rbd-target-api.py
new/ceph-iscsi-3.0+1559837868.g8be74cf/rbd-target-api.py
--- old/ceph-iscsi-3.0+1559815396.g7aa8f7f/rbd-target-api.py 2019-06-06
12:03:16.068678307 +0200
+++ new/ceph-iscsi-3.0+1559837868.g8be74cf/rbd-target-api.py 2019-06-06
18:17:48.174326746 +0200
@@ -394,7 +394,7 @@
target_config = config.config['targets'][target_iqn]
for client_iqn in target_config['clients']:
client_metadata = target_config['clients'][client_iqn]
- image_list = client_metadata['luns'].keys()
+ image_list = list(client_metadata['luns'].keys())
client_auth_config = client_metadata['auth']
client_chap = CHAP(client_auth_config['username'],
client_auth_config['password'],
