Fixes cinder quota failures by using correct keystone auth

JIRA: APEX-59

Change-Id: I0eca415c30cc3fa2377bed3dfc640cc71da3dae7
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/instack.sh b/build/instack.sh
index eb017c2..80cfa47 100755 (executable)
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -272,6 +272,10 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../opendaylight-puppet-neutron
 LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-neutron-force-metadata.patch:/tmp \
                                          --run-command "cd /etc/puppet/modules/neutron && patch -Np1 < /tmp/puppet-neutron-force-metadata.patch" \
                                          -a overcloud-full-odl.qcow2
+LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-cinder-quota-fix.patch:/tmp \
+                                         --run-command "cd /etc/puppet/modules/cinder && patch -Np1 < /tmp/puppet-cinder-quota-fix.patch" \
+                                         -a overcloud-full-odl.qcow2
+# END REMOVE ME AFTER Brahmaputra
 ## END WORK AROUND
 popd
 

diff --git a/build/puppet-cinder-quota-fix.patch b/build/puppet-cinder-quota-fix.patch
new file mode 100644 (file)
index 0000000..2369a51
--- /dev/null
+++ b/build/puppet-cinder-quota-fix.patch
@@ -0,0 +1,24 @@
+From b005b350768987d9423ab22b09f52e79b2eda5d9 Mon Sep 17 00:00:00 2001
+From: Tim Rozet <tdrozet@gmail.com>
+Date: Wed, 20 Jan 2016 13:57:01 -0500
+Subject: [PATCH] Fixes quota problem with cinder
+
+---
+ manifests/api.pp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/manifests/api.pp b/manifests/api.pp
+index 6ffd8a6..9fcb59e 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -282,6 +282,7 @@ class cinder::api (
+   if $keystone_enabled {
+     cinder_config {
+       'DEFAULT/auth_strategy':     value => 'keystone' ;
++      'keystone_authtoken/auth_uri': value => $auth_uri_real;
+     }
+ 
+     cinder_api_paste_ini {
+-- 
+2.5.0
+