commit 3af9b27df1b6ee4bdddc664eeecc5928460e2eef
author Adam Tengler <atengler@mirantis.com> Wed Jul 26 11:47:35 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Wed Jul 26 11:47:37 2017 +0000
tree 07f66be19e563d2b597c1252e83d883f90f45e14
parent c6f6dfa11c84e245fd9eaf77443451f6bed485d3
parent b05a019175ea7b0119995e33e7c3a94731d693f6

Merge "Cluster level param for Salt Syndic master address"

classes/cluster/k8s_ha_calico_syndic/infra/config.yml

diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index bac0814..c46ed75 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -18,11 +18,12 @@
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
     salt_master_host: 127.0.0.1
+    salt_syndic_master_address: 192.168.10.100
   salt:
     syndic:
       enabled: true
       master:
-        host: 192.168.10.90
+        host: ${_param:salt_syndic_master_address}
     master:
       reactor:
         reclass/minion/classify:

classes/cluster/os_ha_ovs_syndic/infra/config.yml

diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index c0ff8a4..cebc119 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -36,6 +36,7 @@
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    salt_syndic_master_address: 192.168.10.100
   linux:
     network:
       interface:
@@ -57,7 +58,7 @@
     syndic:
       enabled: true
       master:
-        host: 192.168.10.90
+        host: ${_param:salt_syndic_master_address}
     master:
       reactor:
         reclass/minion/classify: