[ocata-dvr]change features_designate_pool_manager to features_designate_bind9
Change-Id: I2ef334b1955aaa397bd1e118115775be6408c3a1
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
index 2320f94..a74e3d7 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
@@ -2,6 +2,7 @@
bmk_enabled: 'False'
ceph_enabled: 'False'
cicd_enabled: 'False'
+ designate_backend: bind
cluster_domain: cookied-mcp-ocata-dvr.local
cluster_name: cookied-mcp-ocata-dvr
compute_bond_mode: active-backup
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-environment.yaml
index 6afe16e..f7518bc 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr/_context-environment.yaml
@@ -17,9 +17,9 @@
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
- - features_designate_pool_manager_database
- - features_designate_pool_manager
- - features_designate_pool_manager_keystone
+ - features_designate_bind9_database
+ - features_designate_bind9
+ - features_designate_bind9_keystone
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
@@ -35,8 +35,8 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - features_designate_pool_manager_database
- - features_designate_pool_manager
+ - features_designate_bind9_database
+ - features_designate_bind9
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
@@ -52,8 +52,8 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - features_designate_pool_manager_database
- - features_designate_pool_manager
+ - features_designate_bind9_database
+ - features_designate_bind9
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
@@ -66,7 +66,7 @@
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
- - features_designate_pool_manager_proxy
+ - features_designate_bind9_proxy
- linux_system_codename_xenial
interfaces:
ens3:
@@ -148,7 +148,7 @@
dns01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_dns_node01
roles:
- - features_designate_pool_manager_dns
+ - features_designate_bind9_dns
- linux_system_codename_xenial
classes:
- system.linux.system.repo.mcp.extra
@@ -165,7 +165,7 @@
dns02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_dns_node02
roles:
- - features_designate_pool_manager_dns
+ - features_designate_bind9_dns
- linux_system_codename_xenial
classes:
- system.linux.system.repo.mcp.extra
@@ -177,4 +177,4 @@
role: single_dhcp
ens4:
role: single_ctl
- single_address: ${_param:openstack_dns_node02_address}
+ single_address: ${_param:openstack_dns_node02_address}
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr/openstack.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr/openstack.yaml
index 1e6fbd8..dc9de1c 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr/openstack.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr/openstack.yaml
@@ -54,9 +54,9 @@
{{ SHARED_OPENSTACK.MACRO_INSTALL_HEAT() }}
# install designate backend
-- description: Install powerdns
+- description: Install bind
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@powerdns:server' state.sls powerdns.server
+ -C 'I@bind:server' state.sls bind
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false