Hello community, here is the log from the commit of package openstack-cinder for openSUSE:Factory checked in at 2014-01-20 07:05:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old) and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-cinder" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes 2013-12-03 14:26:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes 2014-01-23 15:50:28.000000000 +0100 @@ -1,0 +2,106 @@ +Thu Jan 16 20:56:03 UTC 2014 - [email protected] + +- default to tgt + +------------------------------------------------------------------- +Wed Jan 15 14:48:34 UTC 2014 - [email protected] + +- add 0001-Robustify-skipactivation-detection.patch + +------------------------------------------------------------------- +Fri Jan 10 20:49:54 UTC 2014 - [email protected] + +- set default keystone signing_dir + +------------------------------------------------------------------- +Thu Jan 2 19:11:14 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev11.gec8ce6c: + + Brick connector revised fix for NFS drivers + + Fix QoS information in initialize_connection() result + +------------------------------------------------------------------- +Sat Dec 21 01:13:58 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev7.gace214a: + + Convert lvm_mirrors to int + + LVM migration: Check if name is equal to dest_vg + +------------------------------------------------------------------- +Tue Dec 17 15:47:14 UTC 2013 - [email protected] + +- add 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch + +------------------------------------------------------------------- +Tue Dec 17 00:47:04 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev3.g67e4b38: + + Bump stable/havana next version to 2013.2.2 + + LVM migrate: Use keywords for the brick instance + +------------------------------------------------------------------- +Mon Dec 16 09:28:02 UTC 2013 - [email protected] + +- fix requires + +------------------------------------------------------------------- +Sat Dec 14 00:57:24 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev48.geb78fee: + + Updated from global requirements + +------------------------------------------------------------------- +Thu Dec 12 09:49:35 UTC 2013 - [email protected] + +- fix deployment of qcow2 images for Boot-from-Volume + +------------------------------------------------------------------- +Wed Dec 11 10:32:51 UTC 2013 - [email protected] + +- make sure boot.lvm is started before cinder-volumes (bnc#854637) + +------------------------------------------------------------------- +Mon Dec 9 01:00:39 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev47.g430f0b9: + + Sync rpc fix from oslo-incubator + +------------------------------------------------------------------- +Sun Dec 8 00:35:10 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev45.g395ec74: + + Add call to retrieve image metadata for volumes in bulk + + LVM: Activate source LV before cloning from it + + Retrieve volume image metadata using single query + + Enable object caching in cinder REST API requests + + Use cached volumes in REST API extensions + +------------------------------------------------------------------- +Sat Dec 7 01:12:51 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev35.g3591f0d: + + GlusterFS: Synchronize operations that manipulate qcow2 data + + GlusterFS: Set correct permissions for volume file created via clone + + Fix Storwize terminate_connection with no host + + Use pipe between ceph backup diff export/import + + Don't do glance v2 calls when config is set to v1 + +------------------------------------------------------------------- +Thu Dec 5 16:42:39 UTC 2013 - [email protected] + +- add tgtd to should-start/stop list (bnc#848959) + +------------------------------------------------------------------- +Sun Dec 1 00:57:36 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev25.g78609c1: + + Continue to delete volumes that DNE in rbd backend + +------------------------------------------------------------------- +Sat Nov 30 00:50:19 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev23.g986d243: + + Fail when image is bigger than the volume + + Pass the size when fetching image in xenapi driver + +------------------------------------------------------------------- @@ -20,0 +127,5 @@ + +------------------------------------------------------------------- +Sun Oct 27 11:06:18 UTC 2013 - [email protected] + +- fix init script again New: ---- 0001-Robustify-skipactivation-detection.patch 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-cinder-doc.spec ++++++ --- /var/tmp/diff_new_pack.t6lqZL/_old 2014-01-23 15:50:29.000000000 +0100 +++ /var/tmp/diff_new_pack.t6lqZL/_new 2014-01-23 15:50:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-cinder-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define component cinder Name: openstack-%{component}-doc -Version: 2013.2.1.dev19.gad05556 +Version: 2013.2.2.dev11.gec8ce6c Release: 0 Summary: OpenStack Block Storage (Cinder) - Documentation License: Apache-2.0 @@ -62,7 +62,7 @@ This package contains documentation files for %{name}. %prep -%setup -q -n cinder-2013.2.1.dev19.gad05556 +%setup -q -n cinder-2013.2.2.dev11.gec8ce6c %openstack_cleanup_prep %build ++++++ openstack-cinder.spec ++++++ --- /var/tmp/diff_new_pack.t6lqZL/_old 2014-01-23 15:50:29.000000000 +0100 +++ /var/tmp/diff_new_pack.t6lqZL/_new 2014-01-23 15:50:29.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-cinder # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2013.2.1.dev19.gad05556 +Version: 2013.2.2.dev11.gec8ce6c Release: 0 Summary: OpenStack Block Storage (Cinder) License: Apache-2.0 @@ -32,11 +32,12 @@ Source2: %{name}.logrotate Source3: cinder-sudoers Patch0: 0001-Avoid-using-GREENDNS-due-to-dnspython.patch +Patch1: 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch +Patch2: 0001-Robustify-skipactivation-detection.patch BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: openstack-suse-sudo BuildRequires: python-base -BuildRequires: python-d2to1 BuildRequires: python-distribute >= 0.6.24 BuildRequires: python-oslo.config BuildRequires: python-six @@ -57,7 +58,7 @@ Requires: python >= 2.6.8 Requires: python-cinder = %{version} Requires: python-kombu >= 2.4.8 -Requires: python-oslo.config >= 1.1.0 +Requires: python-oslo.config >= 1.2.0 Requires: python-swiftclient >= 1.5 %if 0%{?suse_version} > 1110 Requires(pre): pwdutils @@ -90,18 +91,17 @@ Requires: python-WebOb >= 1.2.3 Requires: python-amqplib >= 0.6.1 Requires: python-anyjson >= 0.3.3 -Requires: python-d2to1 >= 0.2.10 Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.4 -Requires: python-keystoneclient >= 0.3.0 +Requires: python-iso8601 >= 0.1.8 +Requires: python-keystoneclient >= 0.3.2 Requires: python-lockfile >= 0.8 Requires: python-lxml >= 2.3 Requires: python-netaddr Requires: python-novaclient >= 2.15.0 Requires: python-paramiko >= 1.8.0 -Requires: python-six +Requires: python-six >= 1.4.1 Requires: python-sqlalchemy-migrate >= 0.7.2 Requires: python-stevedore >= 0.10 Requires: python-suds >= 0.4 @@ -143,6 +143,12 @@ Requires: %{name} = %{version} # needed by EMC Requires: python-pywbem +# needed by Boot from Volume (qemu-img) +%if %suse_version < 1120 +Requires: virt-utils +%else +Requires: qemu-tools +%endif Provides: openstack-nova-volume = 2013.1 Obsoletes: openstack-nova-volume < 2013.1 @@ -180,8 +186,10 @@ functionality of OpenStack Cinder. %prep -%setup -q -n cinder-2013.2.1.dev19.gad05556 +%setup -q -n cinder-2013.2.2.dev11.gec8ce6c %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %openstack_cleanup_prep %build @@ -192,7 +200,8 @@ python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} ### directories -install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log,run}/%{component} +install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component} +install -d -m 750 %{buildroot}%{_localstatedir}/{cache,run}/%{component} install -d -m 755 %{buildroot}%{_sysconfdir}/%{component} ### configuration files @@ -208,6 +217,13 @@ for i in api backup scheduler volume ; do install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/%{name}-$i sed -i -e "s/__NAME__/$i/g" %{buildroot}%{_initddir}/%{name}-$i + bootlvm="" +%if %suse_version < 1310 + if [ "$i" = "volume" ]; then + bootlvm="boot.lvm" + fi +%endif + sed -i -e "s/__BOOT_LVM__/$bootlvm/" %{buildroot}%{_initddir}/%{name}-$i ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i done @@ -231,13 +247,13 @@ #NOTE(saschpe): Don't set 'log_file', each cinder deamon will create it's own if only 'log_dir' is set: crudini --set %{cinder_conf} DEFAULT log_dir /var/log/cinder crudini --set %{cinder_conf} DEFAULT auth_strategy keystone -crudini --set %{cinder_conf} DEFAULT iscsi_helper ietadm crudini --set %{cinder_conf} DEFAULT rootwrap_config /etc/cinder/rootwrap.conf crudini --set %{cinder_conf} DEFAULT state_path /var/lib/cinder #NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? crudini --set %{cinder_conf} DEFAULT sql_connection sqlite:////var/lib/cinder/cinder.db #NOTE(saschpe): Can't hurt to set the default volume_group, only the LVM driver has a it otherwise: crudini --set %{cinder_conf} DEFAULT volume_group cinder-volumes +crudini --set %{cinder_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} @@ -287,6 +303,7 @@ %defattr(-,root,root) %doc LICENSE README.rst %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/cache/%{component} %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} %ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/%{component} %dir %{_sysconfdir}/%{component} ++++++ 0001-Robustify-skipactivation-detection.patch ++++++ >From 32404788855746fe13a6be0b63158fcd434c9d0e Mon Sep 17 00:00:00 2001 From: Dirk Mueller <[email protected]> Date: Wed, 15 Jan 2014 15:45:01 +0100 Subject: [PATCH] Robustify skipactivation detection When lvchange is not in the $PATH for non-root user, this code otherwise traces. Change-Id: I308bd97cb729e83677f18a693274265a182d794c Closes-Bug: #1269445 --- cinder/brick/local_dev/lvm.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py index 0037632..35a8fa7 100644 --- a/cinder/brick/local_dev/lvm.py +++ b/cinder/brick/local_dev/lvm.py @@ -226,11 +226,16 @@ class LVM(executor.Executor): if self._supports_lvchange_ignoreskipactivation is not None: return self._supports_lvchange_ignoreskipactivation - cmd = ['lvchange', '--help'] - (out, err) = self._execute(*cmd) - self._supports_lvchange_ignoreskipactivation = False + try: + cmd = ['lvchange', '--help'] + (out, err) = self._execute( + *cmd, root_helper=self._root_helper, run_as_root=True) + except (putils.ProcessExecutionError, OSError): + LOG.debug(_("Ignoring error during testing whether lvchange " + "can ignore skip activation")) + lines = out.split('\n') for line in lines: if '-K' in line and '--ignoreactivationskip' in line: -- 1.8.4.1 ++++++ 0001-Set-useful-vendor-product-id-in-Cinder-ISCSI-exports.patch ++++++ >From ba9a2d3a12ec287ada256fddee21c6850bd4290a Mon Sep 17 00:00:00 2001 From: Dirk Mueller <[email protected]> Date: Mon, 16 Dec 2013 14:49:37 +0100 Subject: [PATCH] Set useful vendor/product id in Cinder ISCSI exports This can be very useful for debugging and can be used to filter out access from tenant volumes within compute hosts. Change-Id: Ib7ddb824043536a92024ada30476d00fd171e800 --- cinder/brick/iscsi/iscsi.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/cinder/brick/iscsi/iscsi.py b/cinder/brick/iscsi/iscsi.py index 103014e..0a778e3 100644 --- a/cinder/brick/iscsi/iscsi.py +++ b/cinder/brick/iscsi/iscsi.py @@ -155,19 +155,30 @@ class TgtAdm(TargetAdmin): fileutils.ensure_tree(self.volumes_dir) vol_id = name.split(':')[1] + scsi_prod_id = vol_id[:15] + + conf_variables = { + 'name': name, 'path': path, + 'prod_id': scsi_prod_id, + 'chap_auth': chap_auth} + if chap_auth is None: volume_conf = """ - <target %s> - backing-store %s + <target %(name)s> + backing-store %(path)s + vendor_id cinder + product_id %(prod_id)s </target> - """ % (name, path) + """ % conf_variables else: volume_conf = """ - <target %s> - backing-store %s - %s + <target %(name)s> + backing-store %(path)s + vendor_id cinder + product_id %(prod_id)s + %(chap_auth)s </target> - """ % (name, path, chap_auth) + """ % conf_variables LOG.info(_('Creating iscsi_target for: %s') % vol_id) volumes_dir = self.volumes_dir -- 1.8.4.1 ++++++ cinder-stable-havana.tar.gz ++++++ ++++ 3073 lines of diff (skipped) ++++++ openstack-cinder.init ++++++ --- /var/tmp/diff_new_pack.t6lqZL/_old 2014-01-23 15:50:30.000000000 +0100 +++ /var/tmp/diff_new_pack.t6lqZL/_new 2014-01-23 15:50:30.000000000 +0100 @@ -2,10 +2,10 @@ ### BEGIN INIT INFO # Provides: openstack-cinder-__NAME__ -# Required-Start: $remote_fs $syslog +# Required-Start: $remote_fs $syslog __BOOT_LVM__ # Required-Stop: $remote_fs $syslog -# Should-Start: mysql postgresql rabbitmq-server -# Should-Stop: mysql postgresql rabbitmq-server +# Should-Start: mysql postgresql rabbitmq-server tgtd +# Should-Stop: mysql postgresql rabbitmq-server tgtd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenStack Block Storage (Cinder) - __NAME__ @@ -25,11 +25,11 @@ case "$1" in start) echo -n "Checking for DB Migrations" - /usr/bin/cinder-manage db sync + su $USER -s /bin/sh -c "/usr/bin/cinder-manage db sync" rc_status -v echo -n "Starting cinder-$DAEMON" - /sbin/startproc -q -s -u $USER /usr/bin/cinder-$DAEMON --config-file=$CONFFILE + su $USER -s /bin/sh -c "/sbin/startproc -q -s /usr/bin/cinder-$DAEMON --config-file=$CONFFILE" rc_status -v ;; stop) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
