Fix contrail analytics ip in contrail lab and cmp hostnames
Change-Id: I6ba17485c27c382e13ad61afb6b11fd059ebd2f0
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
index ad22679..750dbc0 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail-40/openstack/init.yml b/classes/cluster/os-ha-contrail-40/openstack/init.yml
index cdcfd10..6ecca65 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
index 7e1e78c..8223a11 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
index 0b312e1..9e2222f 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106
diff --git a/classes/cluster/os-ha-contrail/opencontrail/init.yml b/classes/cluster/os-ha-contrail/opencontrail/init.yml
index fea67dd..4462a20 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index a17a62b..011c39c 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106