Adjusting os-ha-ovs-syndic and k8s-ha-calico-syndic models
The patch modifies the model to be used with Salt Master-of-Master
for edge clouds in devcloud.
Change-Id: Idefc9cde062e0fddb4ef06de5fb20f773aab1ea5
Related-PROD: PROD-20579
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
index 81145b1..77b5623 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
@@ -8,6 +8,7 @@
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
+- system.salt.syndic.single
- system.sphinx.server.doc.reclass
- system.keystone.client.core
- system.keystone.client.service.cinder
@@ -45,6 +46,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_enabled: false
linux:
network:
interface:
@@ -63,10 +65,6 @@
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
- syndic:
- enabled: true
- master:
- host: ${_param:salt_syndic_master_address}
master:
reactor:
reclass/minion/classify:
@@ -86,7 +84,7 @@
infra_config:
expression:
- <<node_hostname>>__startswith__cfg
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
cluster_param:
infra_config_address:
value_template: <<node_control_ip>>
@@ -97,28 +95,28 @@
openstack_control01:
expression:
- <<node_hostname>>__equals__ctl01
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
cluster_param:
openstack_control_node01_address:
value_template: <<node_control_ip>>
openstack_control02:
expression:
- <<node_hostname>>__equals__ctl02
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
cluster_param:
openstack_control_node02_address:
value_template: <<node_control_ip>>
openstack_control03:
expression:
- <<node_hostname>>__equals__ctl03
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
cluster_param:
openstack_control_node03_address:
value_template: <<node_control_ip>>
openstack_compute:
expression:
- <<node_hostname>>__startswith__cmp
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.compute
@@ -130,7 +128,7 @@
openstack_gateway:
expression:
- <<node_hostname>>__startswith__gtw
- - <<node_cluster>>__equals__os_ha_ovs_syndic
+ - <<node_cluster>>__equals__os-ha-ovs-syndic
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.gateway