commit 8a6005e59b6aaef34ab8f1ce3e87d4f94faaf3be
author Simon Pasquier <spasquier@mirantis.com> Tue Sep 05 15:31:14 2017 +0200
committer Simon Pasquier <spasquier@mirantis.com> Tue Sep 05 15:31:14 2017 +0200
tree 06667df634fc48e48df396a0035678a100d94255
parent 90aeae34d34e809f6b5aca77aebf50f218ba6026

Fix virtual-mcp11-dvr model

This change makes sure that cluster_domain is taken from
classes/cluster/overrides.yml and not the local init.yml file.

Change-Id: I4a27d00ce25ea5ce2d267b8a70babfd4e217e7d1

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

diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
index 3a73066..c8b49ae 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
@@ -1,5 +1,21 @@
 parameters:
   _param:
+    openstack_database_address: 172.16.10.254
+    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.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_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_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}
+    openstack_gateway_address: 172.16.10.110
     openstack_version: newton
     apt_mk_version: nightly
     mcp_repo_version: 1.1