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/tasks | |
| 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/tasks')
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/aws.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 23 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/openstack.yml | 9 |
3 files changed, 33 insertions, 5 deletions
diff --git a/roles/openshift_cloud_provider/tasks/aws.yml b/roles/openshift_cloud_provider/tasks/aws.yml new file mode 100644 index 000000000..bf2abcbf5 --- /dev/null +++ b/roles/openshift_cloud_provider/tasks/aws.yml @@ -0,0 +1,6 @@ +- name: Create cloud config + ini_file: + dest: "{{ openshift.common.config_base }}/cloudprovider/aws.conf" + section: Global + option: Zone + value: "{{ openshift.provider.zone }}" diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml index e14f944e8..471fd686b 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -1,3 +1,24 @@ --- +- name: Set cloud provider facts + openshift_facts: + role: cloudprovider + openshift_env: "{{ item | oo_openshift_env }}" + openshift_env_structures: + - 'openshift.cloudprovider.aws.*' + - 'openshift.cloudprovider.openstack.*' + no_log: true + with_items: + - "{{ hostvars[inventory_hostname] }}" + - "{{ hostvars }}" + +- name: Create cloudprovider config dir + file: + path: "{{ openshift.common.config_base }}/cloudprovider" + state: directory + when: has_cloudprovider | bool + - include: openstack.yml - when: "openshift_cloud_provider is defined and openshift_cloud_provider == 'openstack' and 'provider' in openshift and openshift.provider.name == 'openstack'" + when: cloudprovider_is_openstack | bool + +- include: aws.yml + when: cloudprovider_is_aws | bool 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)" |