ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Bug | Error message being swallowed in azure_rm_common.py (#33298)

Browse source
This commit is contained in:
ZhijunZhao 2017-11-28 11:03:41 +08:00 committed by ansibot
parent b10859c192
commit a18b7d9b01
8 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/azure_rm_common.py
View file

@ -415,8 +415,8 @@ class AzureRMModuleBase(object):
''' '''
try: try:
return self.rm_client.resource_groups.get(resource_group) return self.rm_client.resource_groups.get(resource_group)
except CloudError: except CloudError as cloud_error:
self.fail("Parameter error: resource group {0} not found".format(resource_group)) self.fail("Error retrieving resource group {0} - {1}".format(resource_group, cloud_error.message))
except Exception as exc: except Exception as exc:
self.fail("Error retrieving resource group {0} - {1}".format(resource_group, str(exc))) self.fail("Error retrieving resource group {0} - {1}".format(resource_group, str(exc)))

5
lib/ansible/modules/cloud/azure/azure_rm_acs.py
View file

@ -523,10 +523,7 @@ class AzureRMContainerService(AzureRMModuleBase):
results = dict() results = dict()
to_be_updated = False to_be_updated = False
try: resource_group = self.get_resource_group(self.resource_group)
resource_group = self.get_resource_group(self.resource_group)
except CloudError:
self.fail('resource group {} not found'.format(self.resource_group))
if not self.location: if not self.location:
self.location = resource_group.location self.location = resource_group.location

5
lib/ansible/modules/cloud/azure/azure_rm_availabilityset.py
View file

@ -203,10 +203,7 @@ class AzureRMAvailabilitySet(AzureRMModuleBase):
response = None response = None
to_be_updated = False to_be_updated = False
try: resource_group = self.get_resource_group(self.resource_group)
resource_group = self.get_resource_group(self.resource_group)
except CloudError:
self.fail('resource group {} not found'.format(self.resource_group))
if not self.location: if not self.location:
self.location = resource_group.location self.location = resource_group.location

4
lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py
View file

@ -279,8 +279,8 @@ class AzureRMRecordSet(AzureRMModuleBase):
for key in self.module_arg_spec.keys(): for key in self.module_arg_spec.keys():
setattr(self, key, kwargs[key]) setattr(self, key, kwargs[key])
# get resource group and zone # retrieve resource group to make sure it exists
resource_group = self.get_resource_group(self.resource_group) self.get_resource_group(self.resource_group)
zone = self.dns_client.zones.get(self.resource_group, self.zone_name) zone = self.dns_client.zones.get(self.resource_group, self.zone_name)
if not zone: if not zone:
self.fail('The zone {0} does not exist in the resource group {1}'.format(self.zone_name, self.resource_group)) self.fail('The zone {0} does not exist in the resource group {1}'.format(self.zone_name, self.resource_group))

2
lib/ansible/modules/cloud/azure/azure_rm_dnszone.py
View file

@ -143,7 +143,7 @@ class AzureRMDNSZone(AzureRMModuleBase):
self.results['check_mode'] = self.check_mode self.results['check_mode'] = self.check_mode
# retrieve resource group to make sure it exists # retrieve resource group to make sure it exists
resource_group = self.get_resource_group(self.resource_group) self.get_resource_group(self.resource_group)
changed = False changed = False
results = dict() results = dict()

6
lib/ansible/modules/cloud/azure/azure_rm_loadbalancer.py
View file

@ -324,11 +324,7 @@ class AzureRMLoadBalancer(AzureRMModuleBase):
pip = None pip = None
load_balancer_props = dict() load_balancer_props = dict()
try: resource_group = self.get_resource_group(self.resource_group)
resource_group = self.get_resource_group(self.resource_group)
except CloudError:
self.fail('resource group {} not found'.format(self.resource_group))
if not self.location: if not self.location:
self.location = resource_group.location self.location = resource_group.location
load_balancer_props['location'] = self.location load_balancer_props['location'] = self.location

8
lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py
View file

@ -234,12 +234,8 @@ class AzureRMManagedDisk(AzureRMModuleBase):
results = dict() results = dict()
resource_group = None resource_group = None
response = None response = None
try:
resource_group = self.get_resource_group(self.resource_group) resource_group = self.get_resource_group(self.resource_group)
except CloudError:
self.fail(
'resource group {} not found'
.format(self.resource_group))
if not self.location: if not self.location:
self.location = resource_group.location self.location = resource_group.location
if self.state == 'present': if self.state == 'present':

5
lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_extension.py
View file

@ -227,10 +227,7 @@ class AzureRMVMExtension(AzureRMModuleBase):
response = None response = None
to_be_updated = False to_be_updated = False
try: resource_group = self.get_resource_group(self.resource_group)
resource_group = self.get_resource_group(self.resource_group)
except CloudError:
self.fail('resource group {} not found'.format(self.resource_group))
if not self.location: if not self.location:
self.location = resource_group.location self.location = resource_group.location