wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Romain dartigues fixes (#29169)

Browse source 
* cloud: azure: fix typo introduced in commit 16d23e9

The commit "Add reference to VNET resource group (#26052)"
removed an used variable.

* network: aos: error hint never shown

(cherry picked from commit 6797221107)
This commit is contained in:
Toshio Kuratomi 2017-09-09 16:20:53 -07:00
parent 1478d0fcf3
commit 4e5051fe00
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1431,7 +1431,7 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
try: try:
self.network_client.virtual_networks.list(virtual_network_resource_group, self.virtual_network_name) self.network_client.virtual_networks.list(virtual_network_resource_group, self.virtual_network_name)
virtual_network_name = self.virtual_network_name virtual_network_name = self.virtual_network_name
except CloudError: except CloudError as exc:
self.fail("Error: fetching virtual network {0} - {1}".format(self.virtual_network_name, str(exc))) self.fail("Error: fetching virtual network {0} - {1}".format(self.virtual_network_name, str(exc)))
else: else:

7
lib/ansible/modules/network/aos/aos_blueprint.py
View file

@ -150,12 +150,11 @@ def create_blueprint(module, aos, name):
except: except:
exc = get_exception() exc = get_exception()
msg = "Unable to create blueprint: %s" % exc.message
if 'UNPROCESSABLE ENTITY' in exc.message: if 'UNPROCESSABLE ENTITY' in exc.message:
msg = 'likely missing dependencies' msg+= ' (likely missing dependencies)'
else:
msg = exc.message
module.fail_json(msg="Unable to create blueprint: %s" % exc.message) module.fail_json(msg=msg)
return blueprint return blueprint