Browse Source

Merge pull request #9473 from cooktheryan/azure-lb-provider

adding parameters to allow for load balancer creation
OpenShift Merge Robot 6 years ago
parent
commit
00115e74c2

+ 4 - 0
roles/openshift_cloud_provider/templates/azure.conf.j2

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

+ 4 - 0
roles/openshift_sanitize_inventory/tasks/main.yml

@@ -93,7 +93,11 @@
         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: