Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

re-order and required values

Ryan Cook 6 years ago
parent
88b2a239c1
commit
656d176b7d
2 changed files with 7 additions and 3 deletions
Split View Show Diff Stats
  1. 3 3
      roles/openshift_cloud_provider/templates/azure.conf.j2
  2. 4 0
      roles/openshift_sanitize_inventory/tasks/main.yml

+ 3 - 3
roles/openshift_cloud_provider/templates/azure.conf.j2
View File 

@@ -4,8 +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 }}
 
-location: {{ openshift_cloudprovider_azure_location }}
 
-primaryAvailabilitySetName: {{ openshift_cloudprovider_azure_availability_set_name }}
 
-securityGroupName: {{ openshift_cloudprovider_azure_security_group_name }}
 
 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
View File 

@@ -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: