Pass through parametrized IP addresses
Change-Id: I1d5d074b5e45af3ceeafae00bec5ee6cb3b52134
diff --git a/classes/cluster/os_ha_contrail/openstack/init.yml b/classes/cluster/os_ha_contrail/openstack/init.yml
index 20d4c9b..b731b10 100755
--- a/classes/cluster/os_ha_contrail/openstack/init.yml
+++ b/classes/cluster/os_ha_contrail/openstack/init.yml
@@ -37,7 +37,7 @@
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
- cluster_public_host: 172.16.10.254
+ cluster_public_host: ${_param:openstack_control_address}
opencontrail_version: 3.0
opencontrail_compute_dns: 8.8.8.8
opencontrail_stats_password: contrail123
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index 62e9b94..3c060f1 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -2,6 +2,10 @@
_param:
openstack_proxy_address: 172.16.10.121
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.101
openstack_control_node02_address: 172.16.10.102
@@ -18,7 +22,7 @@
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
- cluster_public_host: 172.16.10.254
+ cluster_public_host: ${_param:openstack_control_address}
neutron_public_protocol: http
neutron_control_dvr: False
neutron_tenant_network_types: "flat,vxlan"
@@ -33,14 +37,14 @@
galera_server_cluster_name: openstack_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
- cluster_vip_address: 172.16.10.254
+ cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
- cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
- cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -128,13 +132,3 @@
names:
- ctl03
- ctl03.${_param:cluster_domain}
- cmp01:
- address: 172.16.10.105
- names:
- - cmp01
- - cmp01.${_param:cluster_domain}
- cmp02:
- address: 172.16.10.106
- names:
- - cmp02
- - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_contrail/openstack/init.yml b/classes/cluster/sl_os_contrail/openstack/init.yml
index ee2c384..30ac661 100755
--- a/classes/cluster/sl_os_contrail/openstack/init.yml
+++ b/classes/cluster/sl_os_contrail/openstack/init.yml
@@ -37,7 +37,7 @@
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
- cluster_public_host: 172.16.10.254
+ cluster_public_host: ${_param:openstack_control_address}
opencontrail_version: 3.0
opencontrail_compute_dns: 8.8.8.8
opencontrail_stats_password: contrail123
diff --git a/classes/cluster/sl_os_ovs/openstack/init.yml b/classes/cluster/sl_os_ovs/openstack/init.yml
index 82f7f5a..3e59456 100644
--- a/classes/cluster/sl_os_ovs/openstack/init.yml
+++ b/classes/cluster/sl_os_ovs/openstack/init.yml
@@ -2,6 +2,10 @@
_param:
openstack_proxy_address: 172.16.10.121
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.101
openstack_control_node02_address: 172.16.10.102
@@ -35,12 +39,12 @@
galera_server_admin_password: workshop
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_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
- cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop