Move DNS services to infra stage
Powerdns and Bind are possible backends for Designate,
install them always if needed pillar is defined.
designate:server:backend:pdns4 is not needed in Designate.
Change-Id: I925de589c281781c76566e154988a49c49dd4195
Related-Prod: https://mirantis.jira.com/browse/PROD-18317
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 1157083..b2dfe18 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -255,6 +255,15 @@
}
salt.enforceState(master, "I@redis:server ${extra_tgt}", 'redis')
}
+
+ // Install DNS services
+ if (salt.testTarget(master, "I@bind:server ${extra_tgt}")) {
+ salt.enforceState(master, "I@bind:server ${extra_tgt}", 'bind.server')
+ }
+ if (salt.testTarget(master, "I@powerdns:server ${extra_tgt}")) {
+ salt.enforceState(master, "I@powerdns:server ${extra_tgt}", 'powerdns.server')
+ }
+
installBackup(master, 'common', extra_tgt)
}
@@ -397,12 +406,6 @@
// Install designate services
if (salt.testTarget(master, "I@designate:server:enabled ${extra_tgt}")) {
- if (salt.testTarget(master, "I@designate:server:backend:bind9 ${extra_tgt}")) {
- salt.enforceState(master, "I@bind:server ${extra_tgt}", 'bind.server')
- }
- if (salt.testTarget(master, "I@designate:server:backend:pdns4 ${extra_tgt}")) {
- salt.enforceState(master, "I@powerdns:server ${extra_tgt}", 'powerdns.server')
- }
salt.enforceState(master, "I@designate:server and *01* ${extra_tgt}", 'designate.server')
salt.enforceState(master, "I@designate:server ${extra_tgt}", 'designate')
}