diff options
| author | Luis Tomas Bolivar <ltomasbo@redhat.com> | 2017-12-19 17:28:54 +0100 |
|---|---|---|
| committer | Luis Tomas Bolivar <ltomasbo@redhat.com> | 2018-01-08 13:32:11 +0100 |
| commit | 299722b7f4ed1285bf0239f840edeff4cb650118 (patch) | |
| tree | c9d6bcc487378857c454aa473fdfb28e6f4ab944 | |
| parent | ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd (diff) | |
| download | openshift-299722b7f4ed1285bf0239f840edeff4cb650118.tar.gz openshift-299722b7f4ed1285bf0239f840edeff4cb650118.tar.bz2 openshift-299722b7f4ed1285bf0239f840edeff4cb650118.tar.xz openshift-299722b7f4ed1285bf0239f840edeff4cb650118.zip | |
Fix provider network support at openstack playbook
It ensures no floating ips are attached if a provider
network is used
| -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 8d13eb81e..959718486 100644 --- a/roles/openshift_openstack/templates/heat_stack.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack.yaml.j2 @@ -483,7 +483,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -549,8 +549,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 %} @@ -615,7 +620,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -685,7 +690,7 @@ resources: floating_network: if: - no_floating - - null + - '' - {{ openshift_openstack_external_network_name }} {% if openshift_openstack_provider_network_name %} attach_float_net: false @@ -752,8 +757,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 a829da34f..37a009a2f 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 |