Merge "Gate: use swift for glance in armada gate"

2018-07-02 18:56:15 +00:00 · 2018-07-02 18:56:15 +00:00 · 4d0aa8a6d1
commit 4d0aa8a6d1
parent 7ce15f00f4 0bb0cf1b31
2 changed files with 4 additions and 2 deletions
--- 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:
--- 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