Merge pull request #9789 from wkshi/azure-lb-provider-adjust

make azure load balancer creation parameters as options

roles/openshift_cloud_provider/templates/azure.conf.j2

@@ -4,8 +4,16 @@ aadClientId: {{ openshift_cloudprovider_azure_client_id }}
 aadClientSecret: {{ openshift_cloudprovider_azure_client_secret }}
 aadTenantId: {{ openshift_cloudprovider_azure_tenant_id }}
 resourceGroup: {{ openshift_cloudprovider_azure_resource_group }}
+{% if openshift_cloudprovider_azure_cloud is defined %}
 cloud: {{ openshift_cloudprovider_azure_cloud }}
+{% endif %}
 location: {{ openshift_cloudprovider_azure_location }}
+{% if openshift_cloudprovider_azure_vnet_name is defined %}
 vnetName: {{ openshift_cloudprovider_azure_vnet_name }} 
+{% endif %}
+{% if openshift_cloudprovider_azure_security_group_name is defined %}
 securityGroupName: {{ openshift_cloudprovider_azure_security_group_name }}
+{% endif %}
+{% if openshift_cloudprovider_azure_availability_set_name is defined %}
 primaryAvailabilitySetName: {{ openshift_cloudprovider_azure_availability_set_name }}
+{% endif %}

roles/openshift_sanitize_inventory/tasks/main.yml

@@ -93,11 +93,7 @@
         or openshift_cloudprovider_azure_tenant_id is not defined
         or openshift_cloudprovider_azure_subscription_id is not defined
         or openshift_cloudprovider_azure_resource_group is not defined
-        or openshift_cloudprovider_azure_cloud is not defined
         or openshift_cloudprovider_azure_location is not defined
-        or openshift_cloudprovider_azure_vnet_name is not defined
-        or openshift_cloudprovider_azure_security_group_name is not defined
-        or openshift_cloudprovider_azure_availability_set_name is not defined
 
 - name: Ensure removed web console extension variables are not set
   fail: