commit 0efab9648774206a5775b2b28e1873a59ce38dc0
author Vasyl Saienko <vsaienko@mirantis.com> Tue Jul 03 21:58:23 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Tue Jul 03 21:58:23 2018 +0000
tree 040e5d525ec1b5898bd42e09f219c5a858ab30b5
parent 05f48534166c901a371883f73e1ad3222cf11c6e
parent 3282f8629ac58f99a76fc2eb330606c7228d3bc3

Merge "Move cluster_domain from init.yml to infra/init.yml"

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

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

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

diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index 048d300..5fcfe30 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -13,12 +13,7 @@
 - cluster.overrides
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-dvr-ssl.local
-    cluster_name: virtual-mcp-pike-dvr-ssl
     salt_minion_ca_host: cfg01.${linux:system:domain}
-    # infra service addresses
-    infra_config_hostname: cfg01
-    infra_config_address: 172.16.10.100
   salt:
     minion:
       trusted_ca_minions: