commit 55c0f6098c5586290dfac46daa2b0a0aa61a77e6
author Dennis Dmitriev <ddmitriev@mirantis.com> Thu Jul 13 21:03:29 2017 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Fri Jul 14 00:39:55 2017 +0300
tree 9948391a7fa31a09c9f5253feafda9aadbd9f49b
parent 943b7619745a5b2ab89a3b0876ba1770f75aaa7d

Fix interpolation collision between openstack/stacklight for cicd

Change-Id: I76265afbcb9085b86f805e08f8f4daee260b8657

classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml

diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
index 2241bae..6ad2afa 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
@@ -37,6 +37,7 @@
 - cluster.virtual-mcp-ocata-cicd.infra
 parameters:
   _param:
+    glusterfs_service_host: ${_param:cluster_vip_address}
     keepalived_vip_interface: ens4
     keepalived_openstack_telemetry_vip_interface: ens4
     linux_system_codename: xenial

classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index 100bcd8..7d4f5f2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -78,7 +78,6 @@
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
     metadata_password: password
     mysql_admin_user: root