diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-01 15:19:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 15:19:43 -0500 |
| commit | f17a431f07370ce42e3d293011e0a7b71cbd95e3 (patch) | |
| tree | 63758d8e76eaa3f37324434d56a2e055a3d51594 | |
| parent | 27282928e9fc71fe4ed577f44e9210bba5f3cb2c (diff) | |
| parent | 30743eeb3ab79cb2dfa408bde2d65c5b6f57af4e (diff) | |
| download | openshift-f17a431f07370ce42e3d293011e0a7b71cbd95e3.tar.gz openshift-f17a431f07370ce42e3d293011e0a7b71cbd95e3.tar.bz2 openshift-f17a431f07370ce42e3d293011e0a7b71cbd95e3.tar.xz openshift-f17a431f07370ce42e3d293011e0a7b71cbd95e3.zip | |
Merge pull request #6991 from sdodson/vsphere-defaults
Fix vsphere sanitation
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/main.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml index feb5de668..08dfd8284 100644 --- a/roles/openshift_sanitize_inventory/tasks/main.yml +++ b/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 ) |