Merge pull request #6991 from sdodson/vsphere-defaults

Fix vsphere sanitation

roles/openshift_sanitize_inventory/tasks/main.yml

@@ -68,10 +68,10 @@
       When the vSphere cloud provider is configured you must define all of these variables:
       openshift_cloudprovider_vsphere_username, openshift_cloudprovider_vsphere_password,
       openshift_cloudprovider_vsphere_host, openshift_cloudprovider_vsphere_datacenter,
-      openshift_cloudprovider_vsphere_datastore, openshift_cloudprovider_vsphere_folder
-    when:
-      - openshift_cloudprovider_kind is defined
-      - openshift_cloudprovider_kind == 'vsphere'
-      - ( openshift_cloudprovider_vsphere_username is undefined or openshift_cloudprovider_vsphere_password is undefined or
-          openshift_cloudprovider_vsphere_host is undefined or openshift_cloudprovider_vsphere_datacenter is undefined or
-          openshift_cloudprovider_vsphere_datastore is undefined or openshift_cloudprovider_vsphere_folder )
+      openshift_cloudprovider_vsphere_datastore
+  when:
+    - openshift_cloudprovider_kind is defined
+    - openshift_cloudprovider_kind == 'vsphere'
+    - ( openshift_cloudprovider_vsphere_username is undefined or openshift_cloudprovider_vsphere_password is undefined or
+        openshift_cloudprovider_vsphere_host is undefined or openshift_cloudprovider_vsphere_datacenter is undefined or
+        openshift_cloudprovider_vsphere_datastore is undefined )