Merge "Update 'sl_os_ovs' model"
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
new file mode 100644
index 0000000..b50fd3a
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -0,0 +1,2 @@
+FORMULAS_SALT_MASTER+=(mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)
+formula_services+=(${formula_services[@]} ${FORMULAS_SALT_MASTER[@]})
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
new file mode 100644
index 0000000..37f1323
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -0,0 +1,10 @@
+classes:
+ - cluster.virtual-mcp11-aio
+parameters:
+ _param:
+ linux_system_codename: xenial
+ apt_mk_version: stable
+ linux:
+ system:
+ name: cfg01
+ domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index d0c5f40..d72518e 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -20,15 +20,17 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
- single_address: 172.16.10.100
+ reclass_config_master: 192.168.10.90
+ single_address: 172.16.10.90
+ infra_config_address: ${_param:single_address}
+ cluster_domain: virtual-mcp11-aio.local
mysql_admin_user: root
mysql_admin_password: workshop
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
loopback_device_size: 10
- salt_master_host: 192.168.10.100
+ salt_master_host: 192.168.10.90
salt_master_base_environment: prd
salt_minion_ca_host: ${linux:network:fqdn}
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
diff --git a/nodes/cfg01.virtual-mcp11-aio.local.yml b/nodes/cfg01.virtual-mcp11-aio.local.yml
index d1e5865..88f3267 100644
--- a/nodes/cfg01.virtual-mcp11-aio.local.yml
+++ b/nodes/cfg01.virtual-mcp11-aio.local.yml
@@ -1,13 +1,6 @@
classes:
- system.linux.system.single
-- cluster.virtual-mcp11-aio
+- cluster.virtual-mcp11-aio.infra.config
parameters:
_param:
linux_system_codename: xenial
- apt_mk_version: nightly
- salt_master_host: 127.0.0.1
- single_address: 127.0.0.1
- linux:
- system:
- name: cfg01
- domain: virtual-mcp11-aio.local