diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:29:15 -0400 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:29:15 -0400 |
commit | f4687e333679748341326e8d2fff38a8c93a7606 (patch) | |
tree | 2adc41bd73b4c153277ae8d1c47ed62fd0b45228 /roles/openshift_cloud_provider/tasks | |
parent | 238171804159ca5127b0a4d419bc7489b0fa8ab4 (diff) | |
parent | b5f00c416b767b167bbd3d8f61f2b9a534aa5432 (diff) | |
download | openshift-f4687e333679748341326e8d2fff38a8c93a7606.tar.gz openshift-f4687e333679748341326e8d2fff38a8c93a7606.tar.bz2 openshift-f4687e333679748341326e8d2fff38a8c93a7606.tar.xz openshift-f4687e333679748341326e8d2fff38a8c93a7606.zip |
Merge pull request #883 from lebauce/openstack-integration
Add support for Openstack integration
Diffstat (limited to 'roles/openshift_cloud_provider/tasks')
-rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 3 | ||||
-rw-r--r-- | roles/openshift_cloud_provider/tasks/openstack.yml | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml new file mode 100644 index 000000000..e14f944e8 --- /dev/null +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- include: openstack.yml + when: "openshift_cloud_provider is defined and openshift_cloud_provider == 'openstack' and 'provider' in openshift and openshift.provider.name == 'openstack'" diff --git a/roles/openshift_cloud_provider/tasks/openstack.yml b/roles/openshift_cloud_provider/tasks/openstack.yml new file mode 100644 index 000000000..a56f1891a --- /dev/null +++ b/roles/openshift_cloud_provider/tasks/openstack.yml @@ -0,0 +1,9 @@ +- 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 + 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 |