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

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']

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'] }}"