commit dec1e61673063756b96c51f0f79de6bbf234619f
author Jiri Broulik <jbroulik@mirantis.com> Thu Aug 17 17:19:10 2017 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Thu Aug 17 17:19:10 2017 +0200
tree 3e766a9e85c3e6c6b3eecc2f815360312f3f0df7
parent 26104ab47e3d27d8c04dd2be18bda7847f8ac309

step 2 towards backwards compatability

Change-Id: Ifbcf74314f92f6862dd50158d7d7ccf56545af77

classes/cluster/virtual-mcp11-ovs/init.yml

diff --git a/classes/cluster/virtual-mcp11-ovs/init.yml b/classes/cluster/virtual-mcp11-ovs/init.yml
index f923170..6ee5cf7 100644
--- a/classes/cluster/virtual-mcp11-ovs/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/init.yml
@@ -14,33 +14,25 @@
     cluster_domain: virtual-mcp11-ovs.local
     cluster_name: virtual-mcp11-ovs
     # infra service addresses
-    # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    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_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    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_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_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}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     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_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file

classes/cluster/virtual-mcp11-ovs/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 83304b8..45fb5ca 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -122,6 +122,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root: