Adjusting k8s-ha-calico-syndic model
The patch modifies the model to be used with Salt
Master-of-Master for edge clouds in devcloud and makes
the model actual from parent k8s-ha-calico model.
Change-Id: I3e04ddf70174b6bb9a2ed5b3e649ced7172c102f
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 6f51f83..ce7924a 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
@@ -6,6 +6,7 @@
- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.salt.minion.cert.k8s_server
+- system.salt.syndic.single
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- cluster.k8s-ha-calico-syndic
@@ -16,14 +17,12 @@
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
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:
- syndic:
- enabled: true
- master:
- host: ${_param:salt_syndic_master_address}
master:
worker_threads: 40
reactor:
@@ -41,6 +40,8 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
+ deploy_address:
+ value_template: <<node_deploy_ip>>
infra_config:
expression:
- <<node_hostname>>__startswith__cfg
@@ -80,4 +81,6 @@
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
-
+ node_param:
+ deploy_address:
+ value_template: <<node_deploy_ip>>