diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-31 16:05:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 16:05:03 -0800 |
| commit | 21f4fa0f1d23d4e11537d0ca26208e4d0c57908b (patch) | |
| tree | 535dc3885c8c27b5bd732477df58838fcd6fca72 | |
| parent | f76e99011c91e6168834ed05b38a55e992f9ce61 (diff) | |
| parent | 093ad149ae173da9869c2ba1968e66c74ed002e9 (diff) | |
| download | openshift-21f4fa0f1d23d4e11537d0ca26208e4d0c57908b.tar.gz openshift-21f4fa0f1d23d4e11537d0ca26208e4d0c57908b.tar.bz2 openshift-21f4fa0f1d23d4e11537d0ca26208e4d0c57908b.tar.xz openshift-21f4fa0f1d23d4e11537d0ca26208e4d0c57908b.zip | |
Merge pull request #6732 from dav1x/vsphere-stg
Automatic merge from submit-queue.
vsphere storage default add - redo on PR squashing commits
vsphere storage default add - redo on PR squashing commits
| -rw-r--r-- | playbooks/openshift-hosted/private/openshift_default_storage_class.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_default_storage_class/defaults/main.yml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/playbooks/openshift-hosted/private/openshift_default_storage_class.yml b/playbooks/openshift-hosted/private/openshift_default_storage_class.yml index 62fe0dd60..c59ebcead 100644 --- a/playbooks/openshift-hosted/private/openshift_default_storage_class.yml +++ b/playbooks/openshift-hosted/private/openshift_default_storage_class.yml @@ -3,4 +3,6 @@ hosts: oo_first_master roles: - role: openshift_default_storage_class - when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce' or openshift_cloudprovider_kind == 'openstack') + when: + - openshift_cloudprovider_kind is defined + - openshift_cloudprovider_kind in ['aws','gce','openstack','vsphere'] diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml index 014c06641..7ca122fc9 100644 --- a/roles/openshift_default_storage_class/defaults/main.yml +++ b/roles/openshift_default_storage_class/defaults/main.yml @@ -19,6 +19,12 @@ openshift_storageclass_defaults: parameters: fstype: xfs + vsphere: + provisioner: vsphere-volume + name: standard + parameters: + datastore: "{{ openshift_cloudprovider_vsphere_datacenter }}" + openshift_storageclass_default: "true" openshift_storageclass_name: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['name'] }}" openshift_storageclass_provisioner: "{{ openshift_storageclass_defaults[openshift_cloudprovider_kind]['provisioner'] }}" |