diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-03-29 15:56:01 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-03-29 15:56:01 -0400 |
| commit | 67fda43df08a260571eb9b1d7f1ecdab5e323c41 (patch) | |
| tree | 9846c9ff306e69f54b035e9d10c7b05b5fc2aab3 /roles/openshift_cloud_provider/templates | |
| parent | 7b42f91f8637f6c3ce49f357bea75a3e6528b1ba (diff) | |
| download | openshift-67fda43df08a260571eb9b1d7f1ecdab5e323c41.tar.gz openshift-67fda43df08a260571eb9b1d7f1ecdab5e323c41.tar.bz2 openshift-67fda43df08a260571eb9b1d7f1ecdab5e323c41.tar.xz openshift-67fda43df08a260571eb9b1d7f1ecdab5e323c41.zip | |
Add AWS cloud provider support.
Diffstat (limited to 'roles/openshift_cloud_provider/templates')
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack.conf.j2 | 17 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack/cloud.conf.j2 | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/roles/openshift_cloud_provider/templates/openstack.conf.j2 b/roles/openshift_cloud_provider/templates/openstack.conf.j2 new file mode 100644 index 000000000..1b70edc16 --- /dev/null +++ b/roles/openshift_cloud_provider/templates/openstack.conf.j2 @@ -0,0 +1,17 @@ +[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 }} +{% else %} +tenant-name = {{ openshift.cloudprovider.openstack.tenant_name }} +{% endif %} +{% if 'region' in openshift.cloudprovider.openstack %} +region = {{ openshift.cloudprovider.openstack.region }} +{% endif %} +{% if 'lb_subnet_id' in openshift.cloudprovider.openstack %} ++ ++[LoadBalancer] ++subnet-id = {{ openshift.cloudprovider.openstack.lb_subnet_id }} ++{% endif %} 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 |