Hello community, here is the log from the commit of package openstack-cinder for openSUSE:Factory checked in at 2013-03-25 20:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old) and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-cinder", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes 2013-03-08 09:28:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes 2013-03-25 20:41:34.000000000 +0100 @@ -0,0 +1,7 @@ +-------------------------------------------------------------------- +Wed Mar 13 00:16:16 UTC 2013 - cloud-devel@suse.de + +- Update to version 2012.2.4+git.1363133776.ebcd4b7: + + Raise NotImplementedError for NFS snapshot operations + + Only use iscsi_helper config option if using ISCSIDriver + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-cinder-doc.spec ++++++ --- /var/tmp/diff_new_pack.aKwJuz/_old 2013-03-25 20:41:36.000000000 +0100 +++ /var/tmp/diff_new_pack.aKwJuz/_new 2013-03-25 20:41:36.000000000 +0100 @@ -19,7 +19,7 @@ %define component cinder Name: openstack-%{component}-doc -Version: 2012.2.4+git.1362502414.95a620b +Version: 2012.2.4+git.1363133776.ebcd4b7 Release: 1 License: Apache-2.0 Summary: OpenStack Block Storage (Cinder) - Documentation ++++++ openstack-cinder.spec ++++++ --- /var/tmp/diff_new_pack.aKwJuz/_old 2013-03-25 20:41:36.000000000 +0100 +++ /var/tmp/diff_new_pack.aKwJuz/_new 2013-03-25 20:41:36.000000000 +0100 @@ -21,7 +21,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.4+git.1362502414.95a620b +Version: 2012.2.4+git.1363133776.ebcd4b7 Release: 1 License: Apache-2.0 Summary: OpenStack Block Storage (Cinder) ++++++ cinder-stable-folsom.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2012.2.4/ChangeLog new/cinder-2012.2.4/ChangeLog --- old/cinder-2012.2.4/ChangeLog 2013-02-22 19:12:51.000000000 +0100 +++ new/cinder-2012.2.4/ChangeLog 2013-03-12 03:45:15.000000000 +0100 @@ -1,3 +1,27 @@ +commit ebcd4b7c7f98ea3431890b0b38098e8034fa06f8 +Merge: cbad3e3 a616001 +Author: Jenkins <jenkins@review.openstack.org> +Date: Tue Mar 12 02:41:56 2013 +0000 + + Merge "Only use iscsi_helper config option if using ISCSIDriver" into stable/folsom + +commit cbad3e33b5a76e2ae427b943bb4453934d11ed30 +Author: Eric Harney <eharney@redhat.com> +Date: Fri Mar 8 17:38:38 2013 -0500 + + Raise NotImplementedError for NFS snapshot operations + + Since NfsDriver inherits snapshot related methods from VolumeDriver, + it will try to run LVM commands for snapshot calls, when it should + just report that these are not supported for NFS. + + Fixes LP: #1097266 + + Change-Id: Ia438c88d3c8c0a43b512bba9b273e1305f6d0dd0 + + cinder/volume/nfs.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + commit 95a620b9215b937acf73d7248357e1317bc8bca5 Merge: 0eeca98 95c9f6f Author: Jenkins <jenkins@review.openstack.org> @@ -12,6 +36,24 @@ Merge "Check for non-default volume name template." into stable/folsom +commit a6160015c4a9dd20e3303227ecb537bf5cc92c07 +Author: Eric Harney <eharney@redhat.com> +Date: Fri Feb 22 11:20:21 2013 -0500 + + Only use iscsi_helper config option if using ISCSIDriver + + _get_iscsi_properties checks for iscsi_helper == 'tgtadm', but + this is run for drivers other than ISCSIDriver. This means that + when using the Nexenta driver, the target_lun is changed when it + shouldn't be. + + Only change target_lun based on iscsi_helper if using ISCSIDriver. + + Change-Id: I104c1b45f37917ea9f41855c17405f63c4ebcc39 + + cinder/volume/driver.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + commit 68de70dd98911d44fc0825cfd9408ddbc7e978a4 Merge: a8caa79 fcf249d Author: Jenkins <jenkins@review.openstack.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2012.2.4/cinder/volume/driver.py new/cinder-2012.2.4/cinder/volume/driver.py --- old/cinder-2012.2.4/cinder/volume/driver.py 2013-02-22 19:09:31.000000000 +0100 +++ new/cinder-2012.2.4/cinder/volume/driver.py 2013-03-12 03:42:12.000000000 +0100 @@ -536,7 +536,8 @@ try: properties['target_lun'] = int(results[2]) except (IndexError, ValueError): - if FLAGS.iscsi_helper == 'tgtadm': + if (FLAGS.volume_driver == 'cinder.volume.driver.ISCSIDriver' and + FLAGS.iscsi_helper == 'tgtadm'): properties['target_lun'] = 1 else: properties['target_lun'] = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinder-2012.2.4/cinder/volume/nfs.py new/cinder-2012.2.4/cinder/volume/nfs.py --- old/cinder-2012.2.4/cinder/volume/nfs.py 2013-02-22 19:09:31.000000000 +0100 +++ new/cinder-2012.2.4/cinder/volume/nfs.py 2013-03-12 03:42:12.000000000 +0100 @@ -110,6 +110,15 @@ self._execute('rm', '-f', mounted_path, run_as_root=True) + def create_volume_from_snapshot(self, volume, snapshot): + raise NotImplementedError() + + def create_snapshot(self, snapshot): + raise NotImplementedError() + + def delete_snapshot(self, snapshot): + raise NotImplementedError() + def ensure_export(self, ctx, volume): """Synchronously recreates an export for a logical volume.""" self._ensure_share_mounted(volume['provider_location']) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org