Merge "Dynamically generate gateway external address in dvr models"
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 c131590..1f0e0bc 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
@@ -143,6 +143,8 @@
cluster_param:
openstack_gateway_address:
value_template: <<node_control_ip>>
+ openstack_gateway_node01_external_address:
+ value_template: <<node_external_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -212,7 +214,7 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ external_address: ${_param:openstack_gateway_node01_external_address}
openstack_share_node01:
params:
single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 02044b0..8c13d59 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -22,6 +22,7 @@
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_gateway_node01_external_address: 10.16.0.110
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
openstack_share_node01_address: 172.16.10.130
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 4868c19..3cb9888 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -134,6 +134,8 @@
cluster_param:
openstack_gateway_address:
value_template: <<node_control_ip>>
+ openstack_gateway_node01_external_address:
+ value_template: <<node_external_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -200,7 +202,7 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ external_address: ${_param:openstack_gateway_node01_external_address}
openstack_share_node01:
params:
single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 0e595dc..100da01 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -22,6 +22,7 @@
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_gateway_node01_external_address: 10.16.0.110
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
openstack_share_node01_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index d340e7b..aff272f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -150,6 +150,8 @@
cluster_param:
openstack_gateway_address:
value_template: <<node_control_ip>>
+ openstack_gateway_node01_external_address:
+ value_template: <<node_external_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -218,7 +220,7 @@
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ external_address: ${_param:openstack_gateway_node01_external_address}
openstack_share_node01:
params:
single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 934bf8f..a2b7bb5 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -22,6 +22,7 @@
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_gateway_node01_external_address: 10.16.0.110
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
openstack_share_node01_address: 172.16.10.130