Merged changes of Azure modules from Ansible repo (#97)

Azure · Apr 24, 2019 · afbcc3a · afbcc3a
1 parent ebf3494
commit afbcc3a
Show file tree

Hide file tree

Showing 17 changed files with 123 additions and 379 deletions.
diff --git a/files/sha.json b/files/sha.json
@@ -1,6 +1,6 @@
 {
-  "lib/ansible/module_utils/azure_rm_common.py": "8b1b22ddc7dad0d901ecbd96a982e34429bdfdb9", 
-  "lib/ansible/modules/cloud/azure": "22f666c9620396fb1ff7f4559b91182674e99008", 
+  "lib/ansible/module_utils/azure_rm_common.py": "204db4d0444b2d1d3929774b5ac11b71893d3fb6", 
+  "lib/ansible/modules/cloud/azure": "8de2acb81979cf09f661a74e1bc25bf4a3f453da", 
   "packaging/requirements/requirements-azure.txt": "8b1b22ddc7dad0d901ecbd96a982e34429bdfdb9", 
-  "test/integration/targets": "dcbfa60413ece9d3e68fa44fa303a79003bbec75"
+  "test/integration/targets": "0d3d0025055e03f778ef8f13abc4e8adb2f774b8"
 }
diff --git a/library/_azure_rm_managed_disk_facts.py b/library/_azure_rm_managed_disk_facts.py
@@ -138,7 +138,8 @@ def managed_disk_to_dict(managed_disk):
         disk_size_gb=managed_disk.disk_size_gb,
         os_type=managed_disk.os_type.lower() if managed_disk.os_type else None,
         storage_account_type=managed_disk.sku.name if managed_disk.sku else None,
-        managed_by=managed_disk.managed_by
+        managed_by=managed_disk.managed_by,
+        zone=managed_disk.zones[0] if managed_disk.zones and len(managed_disk.zones) > 0 else ''
     )
 
 

diff --git a/library/_azure_rm_virtualmachine_scaleset.py b/library/_azure_rm_virtualmachine_scaleset.py
@@ -839,9 +839,15 @@ def exec_module(self, **kwargs):
                                 .ip_configurations[0].load_balancer_backend_address_pools = load_balancer_backend_address_pools
                             vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
                                 .ip_configurations[0].load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].application_gateway_backend_address_pools = None
                         elif self.application_gateway:
                             vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
                                 .ip_configurations[0].application_gateway_backend_address_pools = application_gateway_backend_address_pools
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].load_balancer_backend_address_pools = None
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].load_balancer_inbound_nat_pools = None
 
                     if self.data_disks is not None:
                         data_disks = []

diff --git a/library/azure_rm_functionapp.py b/library/azure_rm_functionapp.py
@@ -81,7 +81,7 @@
     - azure_tags
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''
@@ -365,6 +365,8 @@ def necessary_functionapp_settings(self):
             function_app_settings.append(NameValuePair(name='WEBSITE_CONTENTSHARE', value=self.name))
         else:
             function_app_settings.append(NameValuePair(name='FUNCTIONS_EXTENSION_VERSION', value='~2'))
+            function_app_settings.append(NameValuePair(name='WEBSITES_ENABLE_APP_SERVICE_STORAGE', value=False))
+            function_app_settings.append(NameValuePair(name='AzureWebJobsStorage', value=self.storage_connection_string))
 
         return function_app_settings
 

diff --git a/library/azure_rm_functionapp_facts.py b/library/azure_rm_functionapp_facts.py
@@ -37,7 +37,7 @@
     - azure
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''

diff --git a/library/azure_rm_loadbalancer.py b/library/azure_rm_loadbalancer.py
@@ -332,7 +332,7 @@
     - azure_tags
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
     - "Yuwei Zhou (@yuwzho)"
 '''
 

diff --git a/library/azure_rm_loadbalancer_facts.py b/library/azure_rm_loadbalancer_facts.py
@@ -39,7 +39,7 @@
     - azure
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''

diff --git a/library/azure_rm_manageddisk_facts.py b/library/azure_rm_manageddisk_facts.py
@@ -138,7 +138,8 @@ def managed_disk_to_dict(managed_disk):
         disk_size_gb=managed_disk.disk_size_gb,
         os_type=managed_disk.os_type.lower() if managed_disk.os_type else None,
         storage_account_type=managed_disk.sku.name if managed_disk.sku else None,
-        managed_by=managed_disk.managed_by
+        managed_by=managed_disk.managed_by,
+        zone=managed_disk.zones[0] if managed_disk.zones and len(managed_disk.zones) > 0 else ''
     )
 
 

diff --git a/library/azure_rm_resourcegroup_facts.py b/library/azure_rm_resourcegroup_facts.py
@@ -145,7 +145,8 @@ def __init__(self):
 
         self.results = dict(
             changed=False,
-            ansible_facts=dict(azure_resourcegroups=[])
+            ansible_facts=dict(azure_resourcegroups=[]),
+            resourcegroups=[]
         )
 
         self.name = None
@@ -170,6 +171,8 @@ def exec_module(self, **kwargs):
             for item in self.results['ansible_facts']['azure_resourcegroups']:
                 item['resources'] = self.list_by_rg(item['name'])
 
+        self.results['resourcegroups'] = self.results['ansible_facts']['azure_resourcegroups']
+
         return self.results
 
     def get_item(self):

diff --git a/library/azure_rm_virtualmachinescaleset.py b/library/azure_rm_virtualmachinescaleset.py
@@ -839,9 +839,15 @@ def exec_module(self, **kwargs):
                                 .ip_configurations[0].load_balancer_backend_address_pools = load_balancer_backend_address_pools
                             vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
                                 .ip_configurations[0].load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].application_gateway_backend_address_pools = None
                         elif self.application_gateway:
                             vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
                                 .ip_configurations[0].application_gateway_backend_address_pools = application_gateway_backend_address_pools
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].load_balancer_backend_address_pools = None
+                            vmss_resource.virtual_machine_profile.network_profile.network_interface_configurations[0] \
+                                .ip_configurations[0].load_balancer_inbound_nat_pools = None
 
                     if self.data_disks is not None:
                         data_disks = []

diff --git a/module_utils/azure_rm_common.py b/module_utils/azure_rm_common.py
@@ -27,7 +27,7 @@
         choices=['auto', 'cli', 'env', 'credential_file', 'msi']
     ),
     profile=dict(type='str'),
-    subscription_id=dict(type='str', no_log=True),
+    subscription_id=dict(type='str'),
     client_id=dict(type='str', no_log=True),
     secret=dict(type='str', no_log=True),
     tenant=dict(type='str', no_log=True),
@@ -1149,8 +1149,9 @@ def _get_profile(self, profile="default"):
 
         return None
 
-    def _get_msi_credentials(self, subscription_id_param=None):
-        credentials = MSIAuthentication()
+    def _get_msi_credentials(self, subscription_id_param=None, **kwargs):
+        client_id = kwargs.get('client_id', None)
+        credentials = MSIAuthentication(client_id=client_id)
         subscription_id = subscription_id_param or os.environ.get(AZURE_CREDENTIAL_ENV_MAPPING['subscription_id'], None)
         if not subscription_id:
             try:
@@ -1206,7 +1207,7 @@ def _get_credentials(self, params):
 
         if auth_source == 'msi':
             self.log('Retrieving credenitals from MSI')
-            return self._get_msi_credentials(arg_credentials['subscription_id'])
+            return self._get_msi_credentials(arg_credentials['subscription_id'], client_id=params.get('client_id', None))
 
         if auth_source == 'cli':
             if not HAS_AZURE_CLI_CORE:

diff --git a/tests/integration/targets/azure_rm_keyvault/tasks/main.yml b/tests/integration/targets/azure_rm_keyvault/tasks/main.yml
@@ -155,7 +155,7 @@
 # azure_rm_keyvaultkey tests
 #
 
-- name: create a kevyault key
+- name: create a keyvault key
   block:
     - azure_rm_keyvaultkey:
         keyvault_uri: https://vault{{ rpfx }}.vault.azure.net
@@ -172,7 +172,7 @@
         state: absent
         key_name: testkey
 
-- name: delete a kevyault key
+- name: delete a keyvault key
   azure_rm_keyvaultkey:
     keyvault_uri: https://vault{{ rpfx }}.vault.azure.net
     state: absent
@@ -185,7 +185,7 @@
 #
 # azure_rm_keyvaultsecret tests
 #
-- name: create a kevyault secret
+- name: create a keyvault secret
   block:
     - azure_rm_keyvaultsecret:
         keyvault_uri: https://vault{{ rpfx }}.vault.azure.net
@@ -203,7 +203,7 @@
         state: absent
         secret_name: testsecret
 
-- name: delete a kevyault secret
+- name: delete a keyvault secret
   azure_rm_keyvaultsecret:
     keyvault_uri: https://vault{{ rpfx }}.vault.azure.net
     state: absent

diff --git a/tests/integration/targets/azure_rm_manageddisk/aliases b/tests/integration/targets/azure_rm_manageddisk/aliases
@@ -1,5 +1,4 @@
 cloud/azure
 shippable/azure/group3
 destructive
-disabled
 azure_rm_manageddisk_facts
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ @@
         - azure
     author:
-        - "Thomas Stringer (@tstringer)"
+        - "Thomas Stringer (@trstringer)"
     '''
     EXAMPLES = '''
@@ Expand Down @@