Merge "Get rid of infra.init class to simplify parameters override" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml b/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-barbican/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
- - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-barbican/init.yml b/classes/cluster/virtual-mcp11-aio-barbican/init.yml
index b1cb0a4..abcf7f0 100755
--- a/classes/cluster/virtual-mcp11-aio-barbican/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-barbican/init.yml
@@ -1,5 +1,4 @@
classes:
-- cluster.virtual-mcp11-aio-barbican.infra
- cluster.virtual-mcp11-aio-barbican.openstack
- cluster.virtual-mcp11-aio
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
- - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-ironic/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
index 448fe80..56513f8 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
@@ -1,5 +1,4 @@
classes:
- cluster.virtual-mcp11-aio
-- cluster.virtual-mcp11-aio-ironic.infra
- cluster.virtual-mcp11-aio-ironic.openstack
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml b/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-manila/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
- - cluster.virtual-mcp11-aio.infra
diff --git a/classes/cluster/virtual-mcp11-aio-manila/init.yml b/classes/cluster/virtual-mcp11-aio-manila/init.yml
index 0d382b8..a810cc7 100755
--- a/classes/cluster/virtual-mcp11-aio-manila/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-manila/init.yml
@@ -1,5 +1,4 @@
classes:
-- cluster.virtual-mcp11-aio-manila.infra
- cluster.virtual-mcp11-aio-manila.openstack
- cluster.virtual-mcp11-aio
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
index 0927924..703458c 100644
--- a/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/infra/config.yml
@@ -1,3 +1,18 @@
classes:
- cluster.virtual-mcp11-aio-ssl
- cluster.virtual-mcp11-aio.infra.config
+parameters:
+ _param:
+ salt_minion_ca_host: cfg01.${linux:system:domain}
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml
deleted file mode 100644
index 325f046..0000000
--- a/classes/cluster/virtual-mcp11-aio-ssl/infra/init.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-classes:
- - cluster.virtual-mcp11-aio.infra
-parameters:
- _param:
- salt_minion_ca_host: cfg01.${linux:system:domain}
- salt:
- minion:
- cert:
- internal_proxy:
- host: ${_param:salt_minion_ca_host}
- authority: ${_param:salt_minion_ca_authority}
- common_name: internal_proxy
- signing_policy: cert_open
- alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
- key_file: "/etc/ssl/private/internal_proxy.key"
- cert_file: "/etc/ssl/certs/internal_proxy.crt"
- all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
diff --git a/classes/cluster/virtual-mcp11-aio-ssl/init.yml b/classes/cluster/virtual-mcp11-aio-ssl/init.yml
index 4000410..3c33799 100755
--- a/classes/cluster/virtual-mcp11-aio-ssl/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ssl/init.yml
@@ -1,5 +1,4 @@
classes:
-- cluster.virtual-mcp11-aio-ssl.infra
- cluster.virtual-mcp11-aio-ssl.openstack
- cluster.virtual-mcp11-aio
- cluster.overrides
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: