commit c2fda22858138401f8c4dc2bb1fd9e1a9d9a80b8
author Adam Tengler <atengler@mirantis.com> Thu Jul 27 12:02:48 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jul 27 12:02:50 2017 +0000
tree f5e13227a97f8031bdc5737fb7dd7527a885ab74
parent 3ed86f83285e2a5cb8b5a609ca146d54112c16c6
parent a38e0cdd71f36aabc8c96cac215caf537b2e38e7

Merge "Move master of masters address param"

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 c46ed75..6814c21 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -18,7 +18,6 @@
     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

classes/cluster/k8s_ha_calico_syndic/infra/init.yml

diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/init.yml b/classes/cluster/k8s_ha_calico_syndic/infra/init.yml
index 3220d0e..afc025c 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/init.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/init.yml
@@ -11,8 +11,9 @@
   _param:
     # infra service addresses
     infra_config_hostname: cfg01
-    infra_config_address: 172.16.10.100
-    infra_config_deploy_address: 192.168.10.100
+    infra_config_address: 172.16.10.90
+    infra_config_deploy_address: 192.168.10.90
+    salt_syndic_master_address: 192.168.10.90
 
     cluster_domain: virtual-mcp11-k8s-calico.local
     cluster_name: virtual-mcp11-k8s-calico

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 cebc119..c4e6757 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -36,7 +36,6 @@
     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:

classes/cluster/os_ha_ovs_syndic/infra/init.yml

diff --git a/classes/cluster/os_ha_ovs_syndic/infra/init.yml b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
index d5b51f9..9dd0187 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/init.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
@@ -4,6 +4,7 @@
     cluster_name: os_ha_ovs
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
+    salt_syndic_master_address: 192.168.10.90
   linux:
     network:
       host: