| commit | 8d282595eab6f97472d585c67a23340bf6a7a89f | [log] [tgz] |
|---|---|---|
| author | Oleh Hryhorov <ohryhorov@mirantis.com> | Tue Jun 19 13:52:20 2018 +0300 |
| committer | Oleh Hryhorov <ohryhorov@mirantis.com> | Tue Jun 19 13:56:00 2018 +0300 |
| tree | ddb5e554428b1c87cfe729216941ddf104a4c327 | |
| parent | bd3ac5680455d7a379314f579a9e0175207a6f25 [diff] |
Arrange including of salt_syndic_enabled To have a possibility to override the parameter by overrides the parameter should be defined in infra/init.yml. Change-Id: I6aedc62efecd51665309bf55c5e4f5f50e39c5d1 Related-PROD: PROD-20579
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml index ce7924a..768d22d 100644 --- a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml +++ b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
@@ -21,7 +21,6 @@ linux_system_codename: xenial salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" salt_master_host: 127.0.0.1 - salt_syndic_enabled: false salt: master: worker_threads: 40
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml index e129b05..681892a 100644 --- a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml +++ b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
@@ -11,6 +11,7 @@ infra_config_address: 172.16.10.90 infra_config_deploy_address: 192.168.10.90 salt_syndic_master_address: 192.168.10.90 + salt_syndic_enabled: false cluster_domain: k8s-ha-calico-syndic.local cluster_name: k8s-ha-calico-syndic
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster/os-ha-ovs-syndic/infra/config.yml index 77b5623..e9f25ba 100644 --- a/classes/cluster/os-ha-ovs-syndic/infra/config.yml +++ b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
@@ -46,7 +46,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_enabled: false 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 61d2374..0639ab8 100644 --- a/classes/cluster/os-ha-ovs-syndic/infra/init.yml +++ b/classes/cluster/os-ha-ovs-syndic/infra/init.yml
@@ -6,6 +6,7 @@ infra_config_hostname: cfg01 infra_config_address: 172.16.10.90 salt_syndic_master_address: 192.168.10.90 + salt_syndic_enabled: false linux: network: host: