Remove unnececssary endpoints and add missing service (Designate) to os_ha_ovs
Change-Id: I99013547b9ef6d0e93d5478a2f8eacf1adcc591d
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 16b265d..41d162d 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -10,8 +10,6 @@
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.core
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.designate
- system.keystone.client.service.cinder
- system.keystone.client.service.cinder2
diff --git a/classes/cluster/os_ha_ovs/openstack/control.yml b/classes/cluster/os_ha_ovs/openstack/control.yml
index 532b41f..d2740df 100644
--- a/classes/cluster/os_ha_ovs/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs/openstack/control.yml
@@ -20,6 +20,8 @@
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
- system.galera.server.cluster
- system.galera.server.database.cinder
- system.galera.server.database.glance
@@ -57,6 +59,34 @@
notification:
driver: messagingv2
topics: "notifications"
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ 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
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ 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
glance:
server:
storage:
@@ -76,6 +106,20 @@
notification:
driver: messagingv2
topics: "notifications"
+ bind:
+ 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
nova:
controller:
networking: dvr
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index 771c191..7e1d100 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -55,6 +55,34 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
+ designate_service_host: ${_param:openstack_control_address}
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ 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
+ designate_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -79,6 +107,7 @@
mysql_keystone_password: workshop
mysql_neutron_password: workshop
mysql_nova_password: workshop
+ mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_cinder_password: workshop
@@ -87,6 +116,7 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
+ keystone_designate_password: workshop
metadata_password: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e