|
|
@ -156,6 +156,11 @@ options:
|
|
|
|
- ReadWrite
|
|
|
|
- ReadWrite
|
|
|
|
default: ReadOnly
|
|
|
|
default: ReadOnly
|
|
|
|
version_added: "2.4"
|
|
|
|
version_added: "2.4"
|
|
|
|
|
|
|
|
virtual_network_resource_group:
|
|
|
|
|
|
|
|
description:
|
|
|
|
|
|
|
|
- When creating a virtual machine, if a specific virtual network from another resource group should be
|
|
|
|
|
|
|
|
used, use this parameter to specify the resource group to use.
|
|
|
|
|
|
|
|
version_added: "2.5"
|
|
|
|
virtual_network_name:
|
|
|
|
virtual_network_name:
|
|
|
|
description:
|
|
|
|
description:
|
|
|
|
- Virtual Network name.
|
|
|
|
- Virtual Network name.
|
|
|
@ -378,6 +383,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
|
|
|
data_disks=dict(type='list'),
|
|
|
|
data_disks=dict(type='list'),
|
|
|
|
subnet_name=dict(type='str', aliases=['subnet']),
|
|
|
|
subnet_name=dict(type='str', aliases=['subnet']),
|
|
|
|
load_balancer=dict(type='str'),
|
|
|
|
load_balancer=dict(type='str'),
|
|
|
|
|
|
|
|
virtual_network_resource_group=dict(type='str'),
|
|
|
|
virtual_network_name=dict(type='str', aliases=['virtual_network']),
|
|
|
|
virtual_network_name=dict(type='str', aliases=['virtual_network']),
|
|
|
|
remove_on_absent=dict(type='list', default=['all']),
|
|
|
|
remove_on_absent=dict(type='list', default=['all']),
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -401,6 +407,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
|
|
|
self.data_disks = None
|
|
|
|
self.data_disks = None
|
|
|
|
self.os_type = None
|
|
|
|
self.os_type = None
|
|
|
|
self.subnet_name = None
|
|
|
|
self.subnet_name = None
|
|
|
|
|
|
|
|
self.virtual_network_resource_group = None
|
|
|
|
self.virtual_network_name = None
|
|
|
|
self.virtual_network_name = None
|
|
|
|
self.tags = None
|
|
|
|
self.tags = None
|
|
|
|
self.differences = None
|
|
|
|
self.differences = None
|
|
|
@ -425,6 +432,10 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
|
|
|
# make sure options are lower case
|
|
|
|
# make sure options are lower case
|
|
|
|
self.remove_on_absent = set([resource.lower() for resource in self.remove_on_absent])
|
|
|
|
self.remove_on_absent = set([resource.lower() for resource in self.remove_on_absent])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# default virtual_network_resource_group to resource_group
|
|
|
|
|
|
|
|
if not self.virtual_network_resource_group:
|
|
|
|
|
|
|
|
self.virtual_network_resource_group = self.resource_group
|
|
|
|
|
|
|
|
|
|
|
|
changed = False
|
|
|
|
changed = False
|
|
|
|
results = dict()
|
|
|
|
results = dict()
|
|
|
|
vmss = None
|
|
|
|
vmss = None
|
|
|
@ -721,7 +732,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
|
|
|
|
|
|
|
|
|
|
|
def get_virtual_network(self, name):
|
|
|
|
def get_virtual_network(self, name):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
vnet = self.network_client.virtual_networks.get(self.resource_group, name)
|
|
|
|
vnet = self.network_client.virtual_networks.get(self.virtual_network_resource_group, name)
|
|
|
|
return vnet
|
|
|
|
return vnet
|
|
|
|
except CloudError as exc:
|
|
|
|
except CloudError as exc:
|
|
|
|
self.fail("Error fetching virtual network {0} - {1}".format(name, str(exc)))
|
|
|
|
self.fail("Error fetching virtual network {0} - {1}".format(name, str(exc)))
|
|
|
@ -729,7 +740,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
|
|
|
|
def get_subnet(self, vnet_name, subnet_name):
|
|
|
|
def get_subnet(self, vnet_name, subnet_name):
|
|
|
|
self.log("Fetching subnet {0} in virtual network {1}".format(subnet_name, vnet_name))
|
|
|
|
self.log("Fetching subnet {0} in virtual network {1}".format(subnet_name, vnet_name))
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
subnet = self.network_client.subnets.get(self.resource_group, vnet_name, subnet_name)
|
|
|
|
subnet = self.network_client.subnets.get(self.virtual_network_resource_group, vnet_name, subnet_name)
|
|
|
|
except CloudError as exc:
|
|
|
|
except CloudError as exc:
|
|
|
|
self.fail("Error: fetching subnet {0} in virtual network {1} - {2}".format(
|
|
|
|
self.fail("Error: fetching subnet {0} in virtual network {1} - {2}".format(
|
|
|
|
subnet_name,
|
|
|
|
subnet_name,
|
|
|
|