Merge "Setup powerdns on separate nodes"
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 9e9d3be..67942b4 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
@@ -120,6 +120,16 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
+ cluster_param:
+ openstack_dns_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
+ cluster_param:
+ openstack_dns_node02_address:
+ value_template: <<node_control_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 9385f96..acea137 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -47,7 +47,6 @@
- system.ceilometer.client
- system.ceilometer.client.cinder_volume
- system.ceilometer.client.neutron
-- cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack.dns
- system.haproxy.proxy.listen.openstack.placement
- system.haproxy.proxy.listen.openstack.manila
- system.manila.control.cluster
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 e88a093..cf24ffd 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -103,6 +103,16 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
+ cluster_param:
+ openstack_dns_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
+ cluster_param:
+ openstack_dns_node02_address:
+ value_template: <<node_control_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 2b1b0b8..dedfea9 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -42,7 +42,6 @@
- system.ceilometer.client
- system.ceilometer.client.cinder_volume
- system.ceilometer.client.neutron
-- cluster.virtual-mcp-pike-dvr-ssl.openstack.dns
- system.haproxy.proxy.listen.openstack.placement
- system.haproxy.proxy.listen.openstack.manila
- system.manila.control.cluster