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

subnet should in the virtual network resource group (#35038)

Browse source 
(cherry picked from commit bec4dcd66c)
This commit is contained in:
Yuwei Zhou 2018-01-25 10:53:28 +08:00 committed by Toshio Kuratomi
parent 38089acae6
commit 09a244fc13
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1467,11 +1467,11 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
# Find a virtual network
no_vnets_msg = "Error: unable to find virtual network in resource group {0}. A virtual network " \
"with at least one subnet must exist in order to create a NIC for the virtual " \
"machine.".format(self.resource_group)
"machine.".format(virtual_network_resource_group)
virtual_network_name = None
try:
vnets = self.network_client.virtual_networks.list(self.resource_group)
vnets = self.network_client.virtual_networks.list(virtual_network_resource_group)
except CloudError:
self.log('cloud error!')
self.fail(no_vnets_msg)
@ -1486,7 +1486,7 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
if self.subnet_name:
try:
subnet = self.network_client.subnets.get(self.resource_group, virtual_network_name, self.subnet_name)
subnet = self.network_client.subnets.get(virtual_network_resource_group, virtual_network_name, self.subnet_name)
subnet_id = subnet.id
except Exception as exc:
self.fail("Error: fetching subnet {0} - {1}".format(self.subnet_name, str(exc)))