moving virtual labs to new templates && system update
Change-Id: I713b73cbfe1a8f168dfd6dcaf5fd4ec34df47758
diff --git a/classes/cluster/virtual-mcp10-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
index 45741a8..6fab7f0 100755
--- a/classes/cluster/virtual-mcp10-contrail/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -14,22 +14,21 @@
cluster_name: virtual-mcp10-contrail
# infra service addresses
- infra_config_address: 172.16.10.100
-
+ infra_config_address: 172.16.10.90
# openstack service addresses
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
-
+ openstack_proxy_hostname: prx
+ openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+ openstack_proxy_node01_hostname: prx01
+ openstack_proxy_node01_address: ${_param:infra_config_address}
+ openstack_control_hostname: ctl
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
-
+ openstack_control_node01_address: 172.16.10.91
+ openstack_control_node02_address: 172.16.10.92
+ openstack_control_node03_address: 172.16.10.93
openstack_database_address: ${_param:openstack_control_address}
- openstack_database_node01_address: ${_param:openstack_control_node01_address}
- openstack_database_node02_address: ${_param:openstack_control_node02_address}
- openstack_database_node03_address: ${_param:openstack_control_node02_address}
-
openstack_message_queue_address: ${_param:openstack_control_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
@@ -51,7 +50,7 @@
stacklight_monitor_node01_address: 172.16.10.107
stacklight_monitor_node02_address: 172.16.10.108
stacklight_monitor_node03_address: 172.16.10.109
-
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+