From c2d49cbff06f348acde42ad583a1401767e52806 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 30 Mar 2016 22:45:01 +0100 Subject: [PATCH] Set default Glance store for the AIO back to Swift In I02b69cf5985e8788513db58f7e8015f8135b9d58 the Glance Store for Swift was appropriately configured to work with the Keystone v3 API and in the new expected way for the Glance Swift Store to be configured for Mitaka. This patch returns the default AIO to use Swift as the backing store for Glance. Change-Id: Iec233f990bd032fb29f633d74137c29bc89f63f5 Closes-Bug: #1561947 --- .../bootstrap-host/templates/user_variables.aio.yml.j2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index 9a81f01b94..8bb72c1884 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -34,11 +34,7 @@ aodh_db_ip: {{ bootstrap_host_mongodb_address }} aodh_db_port: 27017 ## Glance Options -# this has been set to file in the gate because of an upstream bug in glance_store: -# * https://bugs.launchpad.net/glance/+bug/1561947 -# once this issue has been resolved this _needs_ to be reset to "swift" for full -# integration testing in a psuedo production environment. -glance_default_store: file +glance_default_store: swift ## SSL Settings ssl_protocol: "ALL -SSLv2 -SSLv3"