commit 5200c413eeee85e6d8db52b6a54851e82a13fa68
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Mar 15 17:57:19 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Thu Mar 15 17:57:19 2018 +0000
tree 9cf16233f22a19d77cc0d94ec351e7448c22584d
parent fa51ef833e133016cb4658bca7da28ca0d3e11bd
parent b2d7ecfbb5e1c998d5e2e99abddcf7ee3d2cd32c

Merge "Move infra related params to infra/init.yml for virtual-mcp-pike-ovs"

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

diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
index b01723d..4fcb494 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
@@ -1,4 +1,9 @@
 parameters:
+  _param:
+    cluster_domain: virtual-mcp-pike-ovs.local
+    cluster_name: virtual-mcp-pike-ovs
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
   linux:
     network:
       host:

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 3083cdd..d08e08f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -9,11 +9,6 @@
 - 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_config_address: 172.16.10.100
   salt:
     minion:
       trusted_ca_minions: