diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py index d8eb5b9144..af1d1ee664 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py @@ -311,7 +311,7 @@ except ImportError: # This is handled in azure_rm_common pass -from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict +from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict, normalize_location_name from ansible.module_utils._text import to_native @@ -446,6 +446,7 @@ class AzureRMNetworkInterface(AzureRMModuleBase): if not self.location: # Set default location self.location = resource_group.location + self.location = normalize_location_name(self.location) # parse the virtual network resource group and name self.virtual_network = self.parse_resource_to_dict(self.virtual_network) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index 82d3be1824..7a3585a3e9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -614,7 +614,7 @@ except ImportError: pass from ansible.module_utils.basic import to_native, to_bytes -from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict +from ansible.module_utils.azure_rm_common import AzureRMModuleBase, azure_id_to_dict, normalize_location_name AZURE_OBJECT_CLASS = 'VirtualMachine' @@ -742,6 +742,8 @@ class AzureRMVirtualMachine(AzureRMModuleBase): # Set default location self.location = resource_group.location + self.location = normalize_location_name(self.location) + if self.state == 'present': # Verify parameters and resolve any defaults