Get rid of infra.init class to simplify parameters override
Change-Id: I4d1d6017d3cb97cb65314fa00ce882c3483a58c1
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index 3844b99..21a4df8 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -3,6 +3,8 @@
parameters:
_param:
linux_system_codename: xenial
+ apt_mk_version: testing
+ linux_system_purge_repos: false
linux:
system:
name: cfg01
@@ -23,3 +25,6 @@
oslo_templates:
source: pkg
name: salt-formula-oslo-templates
+ minion:
+ trusted_ca_minions:
+ - cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml
deleted file mode 100644
index c74a1ac..0000000
--- a/classes/cluster/virtual-mcp11-aio/infra/init.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-parameters:
- _param:
- apt_mk_version: testing
- linux_system_purge_repos: false
- salt:
- minion:
- trusted_ca_minions:
- - cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 0046bcd..11ab70b 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -13,7 +13,6 @@
- system.memcached.server.single
- system.rabbitmq.server.single
- cluster.virtual-mcp11-aio.openstack
-- cluster.virtual-mcp11-aio.infra
- cluster.overrides
parameters:
_param: