Merge "Dynamically generate gateway external address in dvr models"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index e8a0313..1f0e0bc 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -14,7 +14,6 @@
#-salt/master/formula/pkg/dogtag.yml
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 1078e0c..3cb9888 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -12,7 +12,6 @@
- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 6683c4b..aff272f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -12,7 +12,6 @@
- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index bd9f2ff..49f3406 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -12,7 +12,6 @@
- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 4d2a53c..56dbe98 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -51,11 +51,21 @@
salt:
master:
backup: true
+ initial_data:
+ engine: backupninja
+ source: ctl03
+ home_dir: /srv/volumes/backup/backupninja
+ host: cfg01.virtual-offline-pike-ovs-dpdk
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
minion:
backup: true
+ initial_data:
+ engine: backupninja
+ source: ctl03
+ home_dir: /srv/volumes/backup/backupninja
+ host: cfg01.virtual-offline-pike-ovs-dpdk
reclass:
storage:
class_mapping:
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index da9d6e3..931d137 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -34,6 +34,7 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
+- cluster.virtual-offline-ssl.infra.backup.client_common
- cluster.virtual-offline-ssl
parameters:
_param:
@@ -63,6 +64,12 @@
netmask: 255.255.255.0
salt:
master:
+ backup: true
+ initial_data:
+ engine: backupninja
+ source: ctl03
+ home_dir: /srv/volumes/backup/backupninja
+ host: cfg01.virtual-offline-ssl.local
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
@@ -72,6 +79,14 @@
dogtag:
source: pkg
name: salt-formula-dogtag
+ minion:
+ backup: true
+ initial_data:
+ engine: backupninja
+ source: ctl03
+ home_dir: /srv/volumes/backup/backupninja
+ host: cfg01.virtual-offline-ssl.local
+
reclass:
storage:
class_mapping:
@@ -170,6 +185,7 @@
classes:
- service.galera.master.cluster
- service.dogtag.server.cluster.master
+ - cluster.virtual-offline-ssl.infra.backup.client_mysql
params:
mysql_cluster_role: master
linux_system_codename: xenial
@@ -184,6 +200,7 @@
classes:
- service.galera.slave.cluster
- service.dogtag.server.cluster.slave
+ - cluster.virtual-offline-ssl.infra.backup.server
params:
mysql_cluster_role: slave
linux_system_codename: xenial