Merge "add etcd_control node classification"
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
index bac0814..c46ed75 100644
--- a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -18,11 +18,12 @@
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
master:
- host: 192.168.10.90
+ host: ${_param:salt_syndic_master_address}
master:
reactor:
reclass/minion/classify:
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index c0ff8a4..cebc119 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -36,6 +36,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_master_address: 192.168.10.100
linux:
network:
interface:
@@ -57,7 +58,7 @@
syndic:
enabled: true
master:
- host: 192.168.10.90
+ host: ${_param:salt_syndic_master_address}
master:
reactor:
reclass/minion/classify:
diff --git a/classes/cluster/virtual-mcp11-aio/bootstrap_vars b/classes/cluster/virtual-mcp11-aio/bootstrap_vars
new file mode 100644
index 0000000..3720716
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/bootstrap_vars
@@ -0,0 +1 @@
+export EXTRA_FORMULAS="$EXTRA_FORMULAS mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate"
diff --git a/classes/system b/classes/system
index cb02e31..a3909e2 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit cb02e3183e80d35bd51aee6d1fd6666357c32777
+Subproject commit a3909e204580639b864070a0d5c2130bea26df3f