Merge pull request #7745 from abn/azure

Improve support for azure cloud provider

playbooks/openshift-hosted/private/openshift_default_storage_class.yml

@@ -3,6 +3,4 @@
   hosts: oo_first_master
   roles:
   - role: openshift_default_storage_class
-    when:
-    - openshift_cloudprovider_kind is defined
-    - openshift_cloudprovider_kind in ['aws','gce','openstack','vsphere']
+    when: openshift_cloudprovider_kind | default('none') in ['aws','azure','gce','openstack','vsphere']

roles/openshift_cloud_provider/tasks/azure.yml

@@ -4,3 +4,8 @@
     name: virt_use_samba
     state: yes
     persistent: yes
+
+- name: create cloud config
+  template:
+    dest: "{{ openshift.common.config_base }}/cloudprovider/azure.conf"
+    src: azure.conf.j2

roles/openshift_cloud_provider/templates/azure.conf.j2

@@ -0,0 +1,7 @@
+tenantId: {{ openshift_cloudprovider_azure_tenant_id }}
+subscriptionId: {{ openshift_cloudprovider_azure_subscription_id }}
+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 }}

roles/openshift_default_storage_class/defaults/main.yml

@@ -10,6 +10,14 @@ openshift_storageclass_defaults:
       type: gp2
       kmsKeyId: ''
       encrypted: 'false'
+
+  azure:
+    provisioner: azure-disk
+    name: azure-standard
+    parameters:
+      storageaccounttype: 'Standard_LRS'
+      kind: 'Shared'
+
   gce:
     name: standard
     provisioner: gce-pd

roles/openshift_facts/library/openshift_facts.py

@@ -635,6 +635,9 @@ def build_controller_args(facts):
                     controller_args['cloud-provider'] = ['aws']
                     controller_args['cloud-config'] = [cloud_cfg_path + '/aws.conf']
                     controller_args['disable-attach-detach-reconcile-sync'] = ['true']
+                if facts['cloudprovider']['kind'] == 'azure':
+                    controller_args['cloud-provider'] = ['azure']
+                    controller_args['cloud-config'] = [cloud_cfg_path + '/azure.conf']
                 if facts['cloudprovider']['kind'] == 'openstack':
                     controller_args['cloud-provider'] = ['openstack']
                     controller_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf']
@@ -657,6 +660,9 @@ def build_api_server_args(facts):
                 if facts['cloudprovider']['kind'] == 'aws':
                     api_server_args['cloud-provider'] = ['aws']
                     api_server_args['cloud-config'] = [cloud_cfg_path + '/aws.conf']
+                if facts['cloudprovider']['kind'] == 'azure':
+                    api_server_args['cloud-provider'] = ['azure']
+                    api_server_args['cloud-config'] = [cloud_cfg_path + '/azure.conf']
                 if facts['cloudprovider']['kind'] == 'openstack':
                     api_server_args['cloud-provider'] = ['openstack']
                     api_server_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf']

roles/openshift_management/defaults/main.yml

@@ -48,8 +48,8 @@ openshift_management_storage_class: nfs
 #   configured the required inventory parameters for your cloud
 #   provider
 #
-#   Ensure 'openshift_cloudprovider_kind' is defined (aws or gce) and
-#   that the applicable cloudprovider parameters are provided.
+#   Ensure 'openshift_cloudprovider_kind' is defined (aws, azure or gce)
+#   and that the applicable cloudprovider parameters are provided.
 
 #---------------------------------------------------------------------
 # STORAGE - NFS OPTIONS

roles/openshift_management/tasks/storage/storage.yml

@@ -1,3 +1,3 @@
 ---
 - include_tasks: nfs.yml
-  when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'))
+  when: not (openshift_cloudprovider_kind | default('none') in ['aws', 'azure', 'gce'])

roles/openshift_management/tasks/validate.yml

@@ -49,13 +49,13 @@
 - name: Validate Cloud Provider storage class
   assert:
     that:
-      - openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'
+      - openshift_cloudprovider_kind in ['aws','azure','gce']
     msg: |
       openshift_management_storage_class is 'cloudprovider' but you have an
       invalid kind defined, '{{ openshift_cloudprovider_kind }}'. See
       'openshift_cloudprovider_kind' in the example inventories for
       the required parameters for your selected cloud
-      provider. Working providers: 'aws' and 'gce'.
+      provider. Working providers: 'aws', 'azure' and 'gce'.
   when:
     - openshift_management_storage_class == 'cloudprovider'
     - openshift_cloudprovider_kind is defined
@@ -70,7 +70,7 @@
       required. Search the example inventories for
       'openshift_cloudprovider_kind'. The required parameters for your
       selected cloud provider must be defined in your inventory as
-      well. Working providers: 'aws' and 'gce'.
+      well. Working providers: 'aws', 'azure' and 'gce'.
   when:
     - openshift_management_storage_class == 'cloudprovider'
 

roles/openshift_sanitize_inventory/tasks/main.yml

@@ -77,6 +77,24 @@
         openshift_cloudprovider_vsphere_host is undefined or openshift_cloudprovider_vsphere_datacenter is undefined or
         openshift_cloudprovider_vsphere_datastore is undefined )
 
+- name: Ensure azure configuration variables are defined
+  when: openshift_cloudprovider_kind | default('none') == 'azure'
+  block:
+    - name: ensure provider configuration variables are defined
+      fail:
+        msg: >
+          Required variable(s) for azure provider not defined. Refer to documentation
+          for more information on configuring for azure provider.
+
+          https://github.com/openshift/openshift-docs/blob/master/install_config/configuring_azure.adoc
+      when: >
+        openshift_cloudprovider_azure_client_id is not defined
+        or openshift_cloudprovider_azure_client_secret is not defined
+        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_location is not defined
+
 - name: Ensure removed web console extension variables are not set
   fail:
     msg: >