Merge pull request #8473 from mtnbikenc/fix-1578761

Correct conditional for cloud provider

roles/openshift_node_group/defaults/main.yml

@@ -22,7 +22,7 @@ openshift_node_group_labels: []
 openshift_use_crio: False
 l_crio_var_sock: "/var/run/crio/crio.sock"
 
-openshift_node_group_cloud_provider: "{{ openshift_cloudprovider_kind | default(None) }}"
+openshift_node_group_cloud_provider: "{{ openshift_cloudprovider_kind | default('') }}"
 openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name | default('redhat/openshift-ovs-subnet') }}"
 openshift_node_group_network_plugin: "{{ openshift_node_group_network_plugin_default }}"
 openshift_node_group_node_data_dir_default: "{{ openshift_data_dir | default('/var/lib/origin') }}"

roles/openshift_node_group/templates/node-config.yaml.j2

@@ -44,7 +44,7 @@ kubeletArguments:
   - "true"
   cert-dir:
   - /etc/origin/node/certificates
-{% if openshift_node_group_cloud_provider is defined %}
+{% if openshift_node_group_cloud_provider != '' %}
   cloud-config:
   - /etc/origin/cloudprovider/{{ openshift_node_group_cloud_provider }}.conf
   cloud-provider: