fix models
Fix pike after revert runtest commit
Fix queens deploy
Add designate with powerdns to queens-ovs
Change-Id: I70575e998fe7eed91bc800c7ee76f3e3957d6fe4
diff --git a/tcp_tests/templates/shared-openstack.yaml b/tcp_tests/templates/shared-openstack.yaml
index 9edffda..803b6c9 100644
--- a/tcp_tests/templates/shared-openstack.yaml
+++ b/tcp_tests/templates/shared-openstack.yaml
@@ -247,7 +247,7 @@
skip_fail: true
{%- endmacro %}
-{%- macro MACRO_INSTALL_DESIGNATE(INSTALL_POWERDNS=false) %}
+{%- macro MACRO_INSTALL_DESIGNATE(INSTALL_POWERDNS=false, INSTALL_BIND=false) %}
{%- if INSTALL_POWERDNS %}
- description: Install powerdns
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
@@ -257,6 +257,15 @@
skip_fail: false
{%- endif %}
+ {%- if INSTALL_BIND %}
+- description: Install bind
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'I@bind:server' state.sls bind
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+ {%- endif %}
+
- description: Install designate on primary node
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C "I@designate:server and *01*" state.sls designate.server