commit a5437507da2fbae23798c5cf1a24c8f073a2ef65
author root <root@cfg01.vsaienko-deploy-heat-virtual-mcp-pike-dvr-28.bud-mk.local> Thu Mar 15 14:39:01 2018 +0000
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Mar 16 15:56:26 2018 +0000
tree edb52c486208169b7e0258970d3c4d082416caa1
parent afb2ccc13d957bc5ea7946311b3a1ecfb6868971

Fix overrides work correctly in virtual-mcp-pike-dvr

Change-Id: Ifb1381276ca0a79884cc09e380af4e02ac58360f
Related-Prod: PROD-18328
Related-Prod: PROD-18446

classes/cluster/virtual-mcp-pike-dvr/init.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index d44e9bf..d551411 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -9,29 +9,7 @@
 - cluster.virtual-mcp-pike-dvr.openstack
 - cluster.overrides
 parameters:
-  _param:
-    cluster_domain: virtual-mcp-pike-dvr.local
-    cluster_name: virtual-mcp-pike-dvr
-    # infra service addresses
-    infra_config_hostname: cfg01
-    infra_config_address: 172.16.10.100
-    # openstack service addresses
-    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_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
+  salt:
+    minion:
+      trusted_ca_minions:
+        - cfg01.${linux:system:domain}