diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-31 11:48:36 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-31 11:48:36 -0400 |
| commit | 272ee48caeeab8692f40f0f667e931879f9a0494 (patch) | |
| tree | 45115294ea2abb78c2a1ccbbd36cbfbca581ca32 /roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 | |
| parent | f7a9a0ce7a5057a25cea7e9f66576101a9e9f43a (diff) | |
| parent | 67fda43df08a260571eb9b1d7f1ecdab5e323c41 (diff) | |
| download | openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.gz openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.bz2 openshift-272ee48caeeab8692f40f0f667e931879f9a0494.tar.xz openshift-272ee48caeeab8692f40f0f667e931879f9a0494.zip | |
Merge pull request #1634 from abutcher/aws-cloud-provider
AWS cloud provider
Diffstat (limited to 'roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2')
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 b/roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 deleted file mode 100644 index 388f3a735..000000000 --- a/roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 +++ /dev/null @@ -1,17 +0,0 @@ -[Global] -auth-url = {{ ocp_os_auth_url }} -username = {{ ocp_os_username }} -password = {{ ocp_os_password }} -{% if ocp_os_tenant_id %} -tenant-id = {{ ocp_os_tenant_id }} -{% else %} -tenant-name = {{ ocp_os_tenant_name }} -{% endif %} -{% if ocp_os_region %} -region = {{ ocp_os_region }} -{% endif %} -{% if ocp_os_lb_subnet_id is defined %} -+ -+[LoadBalancer] -+subnet-id = {{ ocp_os_lb_subnet_id }} -+{% endif %}
\ No newline at end of file |