commit c0da678c56e2ae943cc2f428defbbebb6116935b
author Vasyl Saienko <vsaienko@mirantis.com> Wed Mar 14 10:15:56 2018 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Wed Mar 14 11:48:26 2018 +0200
tree 48d6b32e3cb21bb9bde02a68163bc17ad65c9e5e
parent 6c780a90b5f55c24fd105c8794374839aace0b0d

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

Related-Prod: PROD-18328
Related-Prod: PROD-18446

Change-Id: I10dcdd56b4c8e78418155c25ed05f3af262079df

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

diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index 7ee1690..551a911 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -7,27 +7,12 @@
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp-pike-ovs.infra
 - cluster.virtual-mcp-pike-ovs.openstack
-
+- cluster.overrides
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-ovs.local
-    cluster_name: virtual-mcp-pike-ovs
     infra_config_hostname: cfg01
-    # infra service addresses
     infra_config_address: 172.16.10.100
-    # openstack service addresses
-    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_gateway_address: 172.16.10.110
-    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}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-
+  salt:
+    minion:
+      trusted_ca_minions:
+        - cfg01.${linux:system:domain}