From 936518067804b9570e4ccbc95bdc519333b68de4 Mon Sep 17 00:00:00 2001 From: Daniel Badea Date: Wed, 31 Jan 2018 14:10:02 +0000 Subject: [PATCH] CGTS-8837 cinder volume cannot be deleted after swact Using cinder::host causes a deprecation warning in puppet. After switching to cinder::backend_host and locking/unlocking controller followed by swact cinder volumes cannot be deleted anymore. This happens because CONF.host is still used by cinder services (not entirey replaced with CONF.backend_host). Set cinder config DEFAULT/host to cinder::host if defined or cinder::backend_host otherwise. --- SPECS/puppet-cinder.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec index e2e073e..bf848da 100644 --- a/SPECS/puppet-cinder.spec +++ b/SPECS/puppet-cinder.spec @@ -9,6 +9,7 @@ URL: https://launchpad.net/puppet-cinder Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz Patch0001: 0001-Roll-up-TIS-patches.patch +Patch0002: 0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch BuildArch: noarch @@ -26,6 +27,7 @@ Puppet module for OpenStack Cinder %prep %setup -q -n openstack-cinder-%{upstream_version} %patch0001 -p1 +%patch0002 -p1 find . -type f -name ".*" -exec rm {} + find . -size 0 -exec rm {} + -- 1.8.3.1