commit 5f41ed9bd501d040b671015cbdb4107ad06ba570
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Sep 20 16:20:41 2017 +0000
committer Gerrit Code Review <gerrit2@37fca7c923f6> Wed Sep 20 16:20:41 2017 +0000
tree 14a06ca2157760d6bc34b6f05e638fc9da0b8130
parent f30973c9392c37b2a62fc94c2a873693d71a1d3f
parent c70e3c6262bac910fb960c8744e5f1a4377dd3f1

Merge "Added infra_config_hostname soft param to missing virtual labs"

classes/cluster/virtual-mcp05-dvr/infra/init.yml

diff --git a/classes/cluster/virtual-mcp05-dvr/infra/init.yml b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
index 9140bd0..b01723d 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
@@ -5,8 +5,8 @@
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:

classes/cluster/virtual-mcp05-dvr/init.yml

diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
index 1af77a3..1fdd09c 100644
--- a/classes/cluster/virtual-mcp05-dvr/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -14,6 +14,7 @@
     cluster_domain: virtual-mcp05-dvr.local
     cluster_name: virtual-mcp05-dvr
     # infra service addresses
+    infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     # openstack service addresses
     openstack_database_address: 172.16.10.254
@@ -39,4 +40,4 @@
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+    stacklight_log_address: ${_param:stacklight_monitor_address}