From 7d7088ac5cb5dcb20a953dbcf6645e94056a2bf0 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 10 Dec 2017 20:24:01 +0100 Subject: [baremetal] cleanup: Parameterize VCP hostnames We already define the hostnames in a central location (openstack_init), so use the reclass params instead of hardcodes. Also handle hardcoded hostnames in system.haproxy.proxy.listen and system.mongodb.server.cluster. This will also simplify later changes for novcp scenarios. JIRA: FUEL-310 Change-Id: I2a8b4cd1fcb61a7c63f9047123d985bb688dca0a Signed-off-by: Alexandru Avadanii --- .../cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 6 +++--- .../cluster/baremetal-mcp-pike-common-ha/openstack_control.yml | 6 +++--- .../cluster/baremetal-mcp-pike-common-ha/openstack_database.yml | 6 +++--- .../baremetal-mcp-pike-common-ha/openstack_message_queue.yml | 6 +++--- .../cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml index b86049ade..b8c064655 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -22,11 +22,11 @@ parameters: _param: cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:control_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 interface_mtu: 1500 diff --git 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 index 12fc7b07e..0bb5da758 100644 --- 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 @@ -31,11 +31,11 @@ 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' diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml index ba02305a1..733f3f78a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml @@ -28,11 +28,11 @@ parameters: galera_innodb_buffer_pool_size: 2048M cluster_vip_address: ${_param:openstack_database_address} cluster_local_address: ${_param:single_address} - cluster_node01_hostname: dbs01 + cluster_node01_hostname: ${_param:openstack_database_node01_hostname} cluster_node01_address: ${_param:openstack_database_node01_address} - cluster_node02_hostname: dbs02 + cluster_node02_hostname: ${_param:openstack_database_node02_hostname} cluster_node02_address: ${_param:openstack_database_node02_address} - cluster_node03_hostname: dbs03 + cluster_node03_hostname: ${_param:openstack_database_node03_hostname} cluster_node03_address: ${_param:openstack_database_node03_address} dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml index 4228af235..16f9de1c0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml @@ -16,11 +16,11 @@ parameters: keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} - cluster_node01_hostname: msg01 + cluster_node01_hostname: ${_param:openstack_message_queue_node01_hostname} cluster_node01_address: ${_param:openstack_message_queue_node01_address} - cluster_node02_hostname: msg02 + cluster_node02_hostname: ${_param:openstack_message_queue_node02_hostname} cluster_node02_address: ${_param:openstack_message_queue_node02_address} - cluster_node03_hostname: msg03 + cluster_node03_hostname: ${_param:openstack_message_queue_node03_hostname} cluster_node03_address: ${_param:openstack_message_queue_node03_address} dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml index 1c1a3c760..fa50bfbf3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml @@ -21,11 +21,11 @@ parameters: keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} - cluster_node01_hostname: mdb01 + cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname} cluster_node01_address: ${_param:openstack_telemetry_node01_address} - cluster_node02_hostname: mdb02 + cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname} cluster_node02_address: ${_param:openstack_telemetry_node02_address} - cluster_node03_hostname: mdb03 + cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname} cluster_node03_address: ${_param:openstack_telemetry_node03_address} dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} single_nic: ${_param:opnfv_vcp_vm_secondary_interface} -- cgit 1.2.3-korg