From 0bb0cf1b31a63201b7776e9d7b6ad8af2bdaece3 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sun, 1 Jul 2018 13:25:08 +0100
Subject: [PATCH] Gate: use swift for glance in armada gate

This PS updates the armada gate to use swift.

Change-Id: Ib42aea461415aa298ec7cfb648f3d72de9417742
Signed-off-by: Pete Birley <pete@port.direct>
---
 tools/deployment/armada/multinode/armada-ceph.yaml | 3 +++
 tools/deployment/armada/multinode/armada-osh.yaml  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/deployment/armada/multinode/armada-ceph.yaml b/tools/deployment/armada/multinode/armada-ceph.yaml
index ec821e4b65..eab37aa353 100644
--- a/tools/deployment/armada/multinode/armada-ceph.yaml
+++ b/tools/deployment/armada/multinode/armada-ceph.yaml
@@ -253,6 +253,9 @@ data:
     endpoints:
       identity:
         namespace: openstack
+        auth:
+          swift:
+            password: ${SWIFT_USER_PASSWORD}
       object_store:
         namespace: ceph
       ceph_mon:
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index 37bbb84815..0229d80b83 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -523,7 +523,6 @@ data:
       replicas:
         api: 2
         registry: 2
-    storage: radosgw
   source:
     type: local
     location: ${OSH_PATH}
@@ -1563,8 +1562,8 @@ data:
     - deploy-mariadb
     - deploy-memcached
     - openstack-keystone
-    - openstack-glance
     - openstack-radosgw
+    - openstack-glance
     - openstack-cinder
     - openstack-compute-kit
     - openstack-heat