| commit | a38e0cdd71f36aabc8c96cac215caf537b2e38e7 | [log] [tgz] |
|---|---|---|
| author | Adam Tengler <atengler@mirantis.com> | Thu Jul 27 12:01:52 2017 +0000 |
| committer | Adam Tengler <atengler@mirantis.com> | Thu Jul 27 12:02:21 2017 +0000 |
| tree | a90b9477224c2e22da0b8b5827c4f0e2710194b2 | |
| parent | 075ec9a1107afda5a3607a646e8d967472412334 [diff] |
Move master of masters address param Change-Id: Ifd865e72be7d8369ca356e190ab24899212e6dd5
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
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
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:
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: