diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-22 09:11:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 09:11:21 -0500 |
| commit | 986b28f8eca1856559a44c4b73770a4eab4930f4 (patch) | |
| tree | b1881924b1bf985706a366a41589a27e3018e7fe /roles/openshift_openstack | |
| parent | a77205f5b49cc06b18c2d881512f9ec25e347a75 (diff) | |
| parent | 299722b7f4ed1285bf0239f840edeff4cb650118 (diff) | |
| download | openshift-986b28f8eca1856559a44c4b73770a4eab4930f4.tar.gz openshift-986b28f8eca1856559a44c4b73770a4eab4930f4.tar.bz2 openshift-986b28f8eca1856559a44c4b73770a4eab4930f4.tar.xz openshift-986b28f8eca1856559a44c4b73770a4eab4930f4.zip | |
Merge pull request #6525 from luis5tb/fix-provider-network
Fix provider network support at openstack playbook
Diffstat (limited to 'roles/openshift_openstack')
| -rw-r--r-- | roles/openshift_openstack/templates/heat_stack.yaml.j2 | 24 | ||||
| -rw-r--r-- | roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/roles/openshift_openstack/templates/heat_stack.yaml.j2 b/roles/openshift_openstack/templates/heat_stack.yaml.j2 index 1be5d3a62..8e7c6288a 100644 --- a/roles/openshift_openstack/templates/heat_stack.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack.yaml.j2 @@ -523,7 +523,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -589,8 +589,13 @@ resources: secgrp: - { get_resource: lb-secgrp } - { get_resource: common-secgrp } -{% if not openshift_openstack_provider_network_name %} - floating_network: {{ openshift_openstack_external_network_name }} + floating_network: + if: + - no_floating + - '' + - {{ openshift_openstack_external_network_name }} +{% if openshift_openstack_provider_network_name %} + attach_float_net: false {% endif %} volume_size: {{ openshift_openstack_lb_volume_size }} {% if not openshift_openstack_provider_network_name %} @@ -655,7 +660,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -725,7 +730,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -792,8 +797,13 @@ resources: {% endif %} - { get_resource: infra-secgrp } - { get_resource: common-secgrp } -{% if not openshift_openstack_provider_network_name %} - floating_network: {{ openshift_openstack_external_network_name }} + floating_network: + if: + - no_floating + - '' + - {{ openshift_openstack_external_network_name }} +{% if openshift_openstack_provider_network_name %} + attach_float_net: false {% endif %} volume_size: {{ openshift_openstack_infra_volume_size }} {% if openshift_openstack_infra_server_group_policies|length > 0 %} diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 index 1e73c9e1c..29b09f3c9 100644 --- a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 @@ -102,13 +102,11 @@ parameters: label: Attach-float-net description: A switch for floating network port connection -{% if not openshift_openstack_provider_network_name %} floating_network: type: string default: '' label: Floating network description: Network to allocate floating IP from -{% endif %} availability_zone: type: string |