diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
| commit | 791640e083c31e4380a3d7cd929fd67567a944f8 (patch) | |
| tree | d2cf08fbf7a3bca2e5fd35378f40f6758b87f579 /roles/openshift_cloud_provider/templates | |
| parent | b8e72ea2143834317043f19cbc3dddf8ad9047a5 (diff) | |
| download | openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.gz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.bz2 openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.xz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.zip | |
Don't use openshift_env for cloud provider facts.
Diffstat (limited to 'roles/openshift_cloud_provider/templates')
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack.conf.j2 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/roles/openshift_cloud_provider/templates/openstack.conf.j2 b/roles/openshift_cloud_provider/templates/openstack.conf.j2 index 8a06b3a08..4e1695b7b 100644 --- a/roles/openshift_cloud_provider/templates/openstack.conf.j2 +++ b/roles/openshift_cloud_provider/templates/openstack.conf.j2 @@ -1,16 +1,16 @@ [Global] -auth-url = {{ openshift.cloudprovider.openstack.auth_url }} -username = {{ openshift.cloudprovider.openstack.username }} -password = {{ openshift.cloudprovider.openstack.password }} -{% if 'tenant_id' in openshift.cloudprovider.openstack %} -tenant-id = {{ openshift.cloudprovider.openstack.tenant_id }} +auth-url = {{ openshift_cloudprovider_openstack_auth_url }} +username = {{ openshift_cloudprovider_openstack_username }} +password = {{ openshift_cloudprovider_openstack_password }} +{% if openshift_cloudprovider_openstack_tenant_id is defined %} +tenant-id = {{ openshift_cloudprovider_openstack_tenant_id }} {% else %} -tenant-name = {{ openshift.cloudprovider.openstack.tenant_name }} +tenant-name = {{ openshift_cloudprovider_openstack_tenant_name }} {% endif %} -{% if 'region' in openshift.cloudprovider.openstack %} -region = {{ openshift.cloudprovider.openstack.region }} +{% if openshift_cloudprovider_openstack_region is defined %} +region = {{ openshift_cloudprovider_openstack_region }} {% endif %} -{% if 'lb_subnet_id' in openshift.cloudprovider.openstack %} +{% if 'lb_subnet_id' in openshift_cloudprovider_openstack %} [LoadBalancer] -subnet-id = {{ openshift.cloudprovider.openstack.lb_subnet_id }} +subnet-id = {{ openshift_cloudprovider_openstack_lb_subnet_id }} {% endif %} |