diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-10 16:59:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 16:59:07 -0500 |
| commit | 62eef6e8412ea6c34d172e1bfdd57a22ddfc8c2d (patch) | |
| tree | a9385e4c1faabb88bef1aa30b635016b70c6d5f5 | |
| parent | fa8b17c95de8445849ff8412f1c5affd63892c11 (diff) | |
| parent | 52a55f2a5b16e8da59dd21180b077151e57617f2 (diff) | |
| download | openshift-62eef6e8412ea6c34d172e1bfdd57a22ddfc8c2d.tar.gz openshift-62eef6e8412ea6c34d172e1bfdd57a22ddfc8c2d.tar.bz2 openshift-62eef6e8412ea6c34d172e1bfdd57a22ddfc8c2d.tar.xz openshift-62eef6e8412ea6c34d172e1bfdd57a22ddfc8c2d.zip | |
Merge pull request #6423 from dav1x/add-vsphere-provider
Add vsphere provider
| -rw-r--r-- | inventory/hosts.example | 10 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/vsphere.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/templates/vsphere.conf.j2 | 15 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/vars/main.yml | 1 |
5 files changed, 35 insertions, 0 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example index 05293269d..d786146fc 100644 --- a/inventory/hosts.example +++ b/inventory/hosts.example @@ -288,6 +288,16 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # # GCE #openshift_cloudprovider_kind=gce +# +# vSphere +#openshift_cloudprovider_kind=vsphere +#openshift_cloudprovider_vsphere_username=username +#openshift_cloudprovider_vsphere_password=password +#openshift_cloudprovider_vsphere_host=vcenter_host or vsphere_host +#openshift_cloudprovider_vsphere_datacenter=datacenter +#openshift_cloudprovider_vsphere_datastore=datastore +#openshift_cloudprovider_vsphere_folder=optional_folder_name + # Project Configuration #osm_project_request_message='' diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml index dff492a69..3513577fa 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -19,3 +19,6 @@ - include_tasks: gce.yml when: cloudprovider_is_gce | bool + +- include_tasks: vsphere.yml + when: cloudprovider_is_vsphere | bool diff --git a/roles/openshift_cloud_provider/tasks/vsphere.yml b/roles/openshift_cloud_provider/tasks/vsphere.yml new file mode 100644 index 000000000..3a33df241 --- /dev/null +++ b/roles/openshift_cloud_provider/tasks/vsphere.yml @@ -0,0 +1,6 @@ +--- +- name: Create cloud config + template: + dest: "{{ openshift.common.config_base }}/cloudprovider/vsphere.conf" + src: vsphere.conf.j2 + when: openshift_cloudprovider_vsphere_username is defined and openshift_cloudprovider_vsphere_password is defined and openshift_cloudprovider_vsphere_host is defined and openshift_cloudprovider_vsphere_datacenter is defined and openshift_cloudprovider_vsphere_datastore is defined diff --git a/roles/openshift_cloud_provider/templates/vsphere.conf.j2 b/roles/openshift_cloud_provider/templates/vsphere.conf.j2 new file mode 100644 index 000000000..84e5e371c --- /dev/null +++ b/roles/openshift_cloud_provider/templates/vsphere.conf.j2 @@ -0,0 +1,15 @@ +[Global] +user = "{{ openshift_cloudprovider_vsphere_username }}" +password = "{{ openshift_cloudprovider_vsphere_password }}" +server = "{{ openshift_cloudprovider_vsphere_host }}" +port = 443 +insecure-flag = 1 +datacenter = {{ openshift_cloudprovider_vsphere_datacenter }} +datastore = {{ openshift_cloudprovider_vsphere_datastore }} +{% if openshift_cloudprovider_vsphere_folder is defined %} +working-dir = /{{ openshift_cloudprovider_vsphere_datacenter }}/vm/{{ openshift_cloudprovider_vsphere_folder }}/ +{% else %} +working-dir = /{{ openshift_cloudprovider_vsphere_datacenter }}/vm/ +{% endif %} +[Disk] +scsicontrollertype = pvscsi diff --git a/roles/openshift_cloud_provider/vars/main.yml b/roles/openshift_cloud_provider/vars/main.yml index c9d953f58..e71db80b9 100644 --- a/roles/openshift_cloud_provider/vars/main.yml +++ b/roles/openshift_cloud_provider/vars/main.yml @@ -3,3 +3,4 @@ has_cloudprovider: "{{ openshift_cloudprovider_kind | default(None) != None }}" cloudprovider_is_aws: "{{ has_cloudprovider | bool and openshift_cloudprovider_kind == 'aws' }}" cloudprovider_is_openstack: "{{ has_cloudprovider | bool and openshift_cloudprovider_kind == 'openstack' }}" cloudprovider_is_gce: "{{ has_cloudprovider | bool and openshift_cloudprovider_kind == 'gce' }}" +cloudprovider_is_vsphere: "{{ has_cloudprovider | bool and openshift_cloudprovider_kind == 'vsphere' }}" |