summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-29 11:02:28 -0400
committerGitHub <noreply@github.com>2016-08-29 11:02:28 -0400
commit732c0aabc2189de6a0e0ef5cecd35118f5eaf76d (patch)
tree45fafaf857aa91711d315615218c7eaf796b6fbf
parent65495026e3c494521754e252af73e1bd69f46e7d (diff)
parent2e298f12c2168be1bfb9aac790b41baf65c1303d (diff)
downloadopenshift-732c0aabc2189de6a0e0ef5cecd35118f5eaf76d.tar.gz
openshift-732c0aabc2189de6a0e0ef5cecd35118f5eaf76d.tar.bz2
openshift-732c0aabc2189de6a0e0ef5cecd35118f5eaf76d.tar.xz
openshift-732c0aabc2189de6a0e0ef5cecd35118f5eaf76d.zip
Merge pull request #2373 from abutcher/openstack-lb-subnet-id
Fix openstack cloudprovider template conditional.
-rw-r--r--roles/openshift_cloud_provider/templates/openstack.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_cloud_provider/templates/openstack.conf.j2 b/roles/openshift_cloud_provider/templates/openstack.conf.j2
index 4e1695b7b..ce452db24 100644
--- a/roles/openshift_cloud_provider/templates/openstack.conf.j2
+++ b/roles/openshift_cloud_provider/templates/openstack.conf.j2
@@ -10,7 +10,7 @@ tenant-name = {{ openshift_cloudprovider_openstack_tenant_name }}
{% if openshift_cloudprovider_openstack_region is defined %}
region = {{ openshift_cloudprovider_openstack_region }}
{% endif %}
-{% if 'lb_subnet_id' in openshift_cloudprovider_openstack %}
+{% if openshift_cloudprovider_openstack_lb_subnet_id is defined %}
[LoadBalancer]
subnet-id = {{ openshift_cloudprovider_openstack_lb_subnet_id }}
{% endif %}