summaryrefslogtreecommitdiffstats
path: root/roles/openshift_openstack/templates/heat_stack_server.yaml.j2
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-22 09:11:21 -0500
committerGitHub <noreply@github.com>2018-01-22 09:11:21 -0500
commit986b28f8eca1856559a44c4b73770a4eab4930f4 (patch)
treeb1881924b1bf985706a366a41589a27e3018e7fe /roles/openshift_openstack/templates/heat_stack_server.yaml.j2
parenta77205f5b49cc06b18c2d881512f9ec25e347a75 (diff)
parent299722b7f4ed1285bf0239f840edeff4cb650118 (diff)
downloadopenshift-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/templates/heat_stack_server.yaml.j2')
-rw-r--r--roles/openshift_openstack/templates/heat_stack_server.yaml.j22
1 files changed, 0 insertions, 2 deletions
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