From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 11 Dec 2017 17:41:37 +0000 (+0000)
Subject: Merge "[baremetal] cleanup: Parameterize VCP hostnames"
X-Git-Tag: opnfv-6.0.0~219
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d20e0ae39979336cb72202c9a89b1f2db31cb571;p=fuel.git

Merge "[baremetal] cleanup: Parameterize VCP hostnames"
---

d20e0ae39979336cb72202c9a89b1f2db31cb571
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
index f15fbed27,0bb5da758..2cf0596d2
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
@@@ -30,13 -31,14 +30,13 @@@ parameters
      keepalived_vip_virtual_router_id: 50
      cluster_vip_address: ${_param:openstack_control_address}
      cluster_local_address: ${_param:single_address}
-     cluster_node01_hostname: ctl01
+     cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
      cluster_node01_address: ${_param:openstack_control_node01_address}
-     cluster_node02_hostname: ctl02
+     cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
      cluster_node02_address: ${_param:openstack_control_node02_address}
-     cluster_node03_hostname: ctl03
+     cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
      cluster_node03_address: ${_param:openstack_control_node03_address}
      nova_vncproxy_url: https://${_param:cluster_public_host}:6080
 -    glusterfs_version: '3.10'
      dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
      single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
    linux: