commit 21549b03c8d8ae932b160e6c1e0d2eec5c2c6473
author Jakub Pavlik <pavlk.jakub@gmail.com> Fri Jun 16 07:43:21 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Fri Jun 16 07:43:24 2017 +0000
tree e36764d3f8fdaa4c3b8d49bd8a1f7ed32f25f5ef
parent 9bc8416b0b7cfee1795d8105be9b2e0535d1609c
parent 9490db9e68c35acfc357b098ca871fbe8d379760

Merge "Add Glusterfs volume for keystone credential-keys."

glance/control/cluster.yml

diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index b009e9e..6402721 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -42,4 +42,5 @@
           - host: ${_param:openstack_message_queue_node03_address}
       storage:
         engine: file
-      images: []
\ No newline at end of file
+      images: []
+      show_multiple_locations: True

glance/control/single.yml

diff --git a/glance/control/single.yml b/glance/control/single.yml
index 13f4434..458cd37 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -5,3 +5,4 @@
     server:
       database:
         host: ${_param:single_address}
+      show_multiple_locations: True

salt/control/cluster/openstack_gateway_cluster.yml

diff --git a/salt/control/cluster/openstack_gateway_cluster.yml b/salt/control/cluster/openstack_gateway_cluster.yml
index 5d2a20a..84c44ac 100644
--- a/salt/control/cluster/openstack_gateway_cluster.yml
+++ b/salt/control/cluster/openstack_gateway_cluster.yml
@@ -17,10 +17,10 @@
               image: ${_param:salt_control_xenial_image}
               size: openstack.gateway
             gtw02:
-              provider: kvm01.${_param:cluster_domain}
+              provider: kvm02.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: openstack.gateway
             gtw03:
-              provider: kvm01.${_param:cluster_domain}
+              provider: kvm03.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: openstack.gateway