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/tasks/openstack.yml | |
| 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/tasks/openstack.yml')
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/openstack.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/roles/openshift_cloud_provider/tasks/openstack.yml b/roles/openshift_cloud_provider/tasks/openstack.yml index a56f1891a..c501121e5 100644 --- a/roles/openshift_cloud_provider/tasks/openstack.yml +++ b/roles/openshift_cloud_provider/tasks/openstack.yml @@ -1,9 +1,10 @@ +--- - fail: msg: "The Openstack integration requires OpenShift Enterprise 3.2 or Origin 1.2." when: not openshift.common.version_gte_3_2_or_1_2 | bool -- name: Create /etc/cloud.conf +- name: Create cloud config template: - dest: /etc/cloud.conf - src: openstack/cloud.conf.j2 - when: ocp_os_auth_url and ocp_os_username and ocp_os_password and (ocp_os_tenant_id or ocp_os_tenant_name)
\ No newline at end of file + dest: "{{ openshift.common.config_base }}/cloudprovider/openstack.conf" + src: openstack.conf.j2 + when: "'auth_url' in openshift.cloudprovider.openstack and 'username' in openshift.cloudprovider.openstack and 'password' in openshift.cloudprovider.openstack and ('tenant_id' in openshift.cloudprovider.openstack or 'tenant_name' in openshift.cloudprovider.openstack)" |