From 300718bea5ea00527be7d9f309f3333f9453678d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 7 Mar 2016 11:54:22 -0500
Subject: [PATCH] scenario002: disable swift backend for Glance on Ubuntu

UCA contains a wrong version on glance-store that is not working when
running Swift backend.

Until they update the package to 0.13.0, we can't test Swift backend
anymore on Trusty.

Change-Id: I43f64f757cc28232f367a4a454b6e499f31c5fe8
---
 fixtures/scenario002.pp | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index 8999b67e3..2352eae2d 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.pp
@@ -14,6 +14,24 @@
 # limitations under the License.
 #
 
+case $::osfamily {
+  'Debian': {
+    # ironic-conductor is broken for Ubuntu Trusty
+    # https://bugs.launchpad.net/cloud-archive/+bug/1530869
+    $ironic_enabled = false
+    # UCA needs to update glance-store to 0.13.0 because 0.12.0 is broken
+    # when using Swift backend
+    $glance_backend = 'file'
+  }
+  'RedHat': {
+    $ironic_enabled  = true
+    $glance_backend  = 'swift'
+  }
+  default: {
+    fail("Unsupported osfamily (${::osfamily})")
+  }
+}
+
 include ::openstack_integration
 class { '::openstack_integration::config':
   ssl  => true,
@@ -24,7 +42,7 @@ include ::openstack_integration::rabbitmq
 include ::openstack_integration::mysql
 include ::openstack_integration::keystone
 class { '::openstack_integration::glance':
-  backend => 'swift',
+  backend => $glance_backend,
 }
 include ::openstack_integration::neutron
 include ::openstack_integration::nova
@@ -34,19 +52,6 @@ include ::openstack_integration::ironic
 include ::openstack_integration::mongodb
 include ::openstack_integration::provision
 
-case $::osfamily {
-  'Debian': {
-    # ironic-conductor is broken for Ubuntu Trusty
-    # https://bugs.launchpad.net/cloud-archive/+bug/1530869
-    $ironic_enabled = false
-  }
-  'RedHat': {
-    $ironic_enabled = true
-  }
-  default: {
-    fail("Unsupported osfamily (${::osfamily})")
-  }
-}
 
 class { '::openstack_integration::tempest':
   cinder => true,