changed logic due to failures in CI

playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -51,7 +51,8 @@
       name: openshift_cloud_provider
       tasks_from: vsphere-svc
     when:
-    - openshift_cloudprovider_kind in 'vsphere'
+    - openshift_cloudprovider_kind is defined
+    - openshift_cloudprovider_kind == 'vsphere'
     - openshift_version | version_compare('3.9', '>=')
 
 # The main master upgrade play. Should handle all changes to the system in one pass, with
@@ -78,7 +79,8 @@
       name: openshift_master
       tasks_from: update-vsphere
     when:
-    - openshift_cloudprovider_kind in 'vsphere'
+    - openshift_cloudprovider_kind is defined
+    - openshift_cloudprovider_kind == 'vsphere'
     - openshift_version | version_compare('3.9', '>=')
 
   - name: Setup and enable bootstrapping options

roles/openshift_master/tasks/main.yml

@@ -263,14 +263,16 @@
     name: openshift_cloud_provider
     tasks_from: vsphere-svc
   when:
-  - openshift_cloudprovider_kind in 'vsphere'
+  - openshift_cloudprovider_kind is defined
+  - openshift_cloudprovider_kind == 'vsphere'
   - openshift_version | version_compare('3.9', '>=')
   - inventory_hostname == openshift_master_hosts[0]
 
 - name: update vsphere provider master config
   include_tasks: update-vsphere.yml
   when:
-  - openshift_cloudprovider_kind in 'vsphere'
+  - openshift_cloudprovider_kind is defined
+  - openshift_cloudprovider_kind == 'vsphere'
   - openshift_version | version_compare('3.9', '>=')
 
 - name: Dump logs from master-controllers if it failed