Change designate backend in virtual-mcp-ocata-dvr
Change-Id: I8d8ed4e298171bfba905e9fb04d7d184914eac6a
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 434abec..29bdc19 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -22,7 +22,7 @@
- system.cinder.control.cluster
- system.heat.server.cluster
- system.designate.server.cluster
-- system.designate.server.backend.bind
+- system.designate.server.backend.pdns
- system.galera.server.cluster
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
@@ -57,20 +57,13 @@
instance:
VIP:
virtual_router_id: 150
- bind:
+ powerdns:
server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
+ axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
keystone:
server:
admin_email: ${_param:admin_email}
@@ -92,9 +85,8 @@
options:
host: ${_param:openstack_control_node02_address}
port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_endpoint: "http://${_param:openstack_control_node02_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
default2:
type: ${_param:designate_pool_target_type}
description: 'test target3'
@@ -102,9 +94,8 @@
options:
host: ${_param:openstack_control_node03_address}
port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_endpoint: "http://${_param:openstack_control_node03_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
glance:
server:
storage:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 3b0c78f..4bca9d3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -33,8 +33,11 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ powerdns_webserver_password: gJ6n3gVaYP8eS
+ powerdns_webserver_port: 8081
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_pdns_api_key: VxK9cMlFL5Ae
+ designate_pdns_api_endpoint: "http://${_param:openstack_control_node01_address}:${_param:powerdns_webserver_port}"
designate_pool_ns_records:
- hostname: 'ns1.example.org.'
priority: 10
@@ -45,7 +48,7 @@
port: 53
- host: ${_param:openstack_control_node03_address}
port: 53
- designate_pool_target_type: bind9
+ designate_pool_target_type: pdns4
designate_pool_target_masters:
- host: ${_param:openstack_control_node01_address}
port: 5354
@@ -56,9 +59,8 @@
designate_pool_target_options:
host: ${_param:openstack_control_node01_address}
port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
designate_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}