Update sl-pike-dvr model
Change-Id: If2ea2690b2787528e918bdc4477453360f2d2c2c
Closes-Bug: PROD-21138
diff --git a/classes/cluster/sl-pike-dvr/openstack/init.yml b/classes/cluster/sl-pike-dvr/openstack/init.yml
index 4a7ef7e..715546d 100644
--- a/classes/cluster/sl-pike-dvr/openstack/init.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/init.yml
@@ -1,5 +1,36 @@
parameters:
_param:
+ openstack_proxy_hostname: prx01
+ openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+ openstack_proxy_node01_hostname: prx01
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_hostname: ctl
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.91
+ openstack_control_node02_address: 172.16.10.92
+ openstack_control_node03_address: 172.16.10.93
+ openstack_gateway_hostname: gtw
+ openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+ openstack_gateway_node01_hostname: gtw01
+ openstack_gateway_node01_address: 172.16.10.94
+ openstack_compute_node01_hostname: cmp01
+ openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_address: 172.16.10.95
+ openstack_compute_node02_address: 172.16.10.96
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+
openstack_version: pike
apt_mk_version: nightly
cinder_version: ${_param:openstack_version}
@@ -30,68 +61,15 @@
cluster_vip_address: 172.16.10.254
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
+ cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
- powerdns_axfr_ips:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- - 127.0.0.1
- powerdns_supermasters:
- - ip: ${_param:openstack_control_node01_address}
- nameserver: ns1.example.org
- account: master
- - ip: ${_param:openstack_control_node02_address}
- nameserver: ns2.example.org
- account: master
- - ip: ${_param:openstack_control_node03_address}
- nameserver: ns3.example.org
- account: master
- powerdns_overwrite_supermasters: True
- powerdns_webserver_password: gJ6n3gVaYP8eS
- powerdns_webserver_port: 8081
- designate_admin_api_enabled: true
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_mdns_address: 0.0.0.0
- designate_mdns_port: 53
- designate_pdns_api_key: VxK9cMlFL5Ae
- designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
- designate_pool_manager_enabled: True
- designate_pool_manager_periodic_sync_interval: '120'
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- - hostname: 'ns2.example.org.'
- priority: 20
- - hostname: 'ns3.example.org.'
- priority: 30
- designate_pool_nameservers:
- - host: ${_param:openstack_dns_node01_address}
- port: 53
- - host: ${_param:openstack_dns_node02_address}
- port: 53
- designate_pool_target_type: pdns4
- designate_pool_target_masters:
- - 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_options:
- host: ${_param:openstack_dns_node01_address}
- port: 53
- api_token: ${_param:designate_pdns_api_key}
- api_endpoint: ${_param:designate_pdns_api_endpoint}
- designate_quota_zones: 40
- designate_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -113,7 +91,6 @@
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
glusterfs_service_host: ${_param:cluster_vip_address}
- designate_service_host: ${_param:cluster_vip_address}
metadata_password: password
mysql_admin_user: root
mysql_admin_password: workshop
@@ -126,7 +103,6 @@
mysql_neutron_password: workshop
mysql_nova_password: workshop
mysql_aodh_password: workshop
- mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_aodh_password: workshop
@@ -137,7 +113,6 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
- keystone_designate_password: workshop
ceilometer_secret_key: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
@@ -158,58 +133,53 @@
prx:
address: ${_param:openstack_proxy_address}
names:
- - prx
- - prx.${_param:cluster_domain}
+ - ${_param:openstack_proxy_hostname}
+ - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
prx01:
address: ${_param:openstack_proxy_node01_address}
names:
- - prx01
- - prx01.${_param:cluster_domain}
+ - ${_param:openstack_proxy_node01_hostname}
+ - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
ctl:
address: ${_param:openstack_control_address}
names:
- - ctl
- - ctl.${_param:cluster_domain}
+ - ${_param:openstack_control_hostname}
+ - ${_param:openstack_control_hostname}.${_param:cluster_domain}
ctl01:
address: ${_param:openstack_control_node01_address}
names:
- - ctl01
- - ctl01.${_param:cluster_domain}
+ - ${_param:openstack_control_node01_hostname}
+ - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
ctl02:
address: ${_param:openstack_control_node02_address}
names:
- - ctl02
- - ctl02.${_param:cluster_domain}
+ - ${_param:openstack_control_node02_hostname}
+ - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
ctl03:
address: ${_param:openstack_control_node03_address}
names:
- - ctl03
- - ctl03.${_param:cluster_domain}
+ - ${_param:openstack_control_node03_hostname}
+ - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+ gtw:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
gtw01:
address: ${_param:openstack_gateway_address}
names:
- - gtw01
- - gtw01.${_param:cluster_domain}
- cmp01:
- address: 172.16.10.105
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+ cmp0:
+ address: ${_param:openstack_control_node01_address}
names:
- - cmp01
- - cmp01.${_param:cluster_domain}
- cmp02:
- address: 172.16.10.106
+ - ${_param:openstack_compute_node01_hostname}
+ - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+ cmp1:
+ address: ${_param:openstack_control_node02_address}
names:
- - cmp02
- - cmp02.${_param:cluster_domain}
- dns01:
- address: ${_param:openstack_dns_node01_address}
- names:
- - dns01
- - dns01.${_param:cluster_domain}
- dns02:
- address: ${_param:openstack_dns_node02_address}
- names:
- - dns02
- - dns02.${_param:cluster_domain}
+ - ${_param:openstack_compute_node02_hostname}
+ - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
system:
user:
root: