cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add os_profile to VM facts, allow to filter by OS (#48040)

Browse source
This commit is contained in:
Patrick Marques 2019-05-17 07:44:44 +01:00 • committed by Yunge Zhu
parent ba8846ab74
commit 1eb5fb9541
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/plugins/inventory/azure_rm.py
View file

@ -93,6 +93,7 @@ EXAMPLES = '''
# id: the VM's Azure resource ID, eg /subscriptions/00000000-0000-0000-1111-1111aaaabb/resourceGroups/my_rg/providers/Microsoft.Compute/virtualMachines/my_vm # id: the VM's Azure resource ID, eg /subscriptions/00000000-0000-0000-1111-1111aaaabb/resourceGroups/my_rg/providers/Microsoft.Compute/virtualMachines/my_vm
# location: the VM's Azure location, eg 'westus', 'eastus' # location: the VM's Azure location, eg 'westus', 'eastus'
# name: the VM's resource name, eg 'myvm' # name: the VM's resource name, eg 'myvm'
# os_profile: The VM OS properties, a dictionary, only system is currently available, eg 'os_profile.system not in ['linux']'
# powerstate: the VM's current power state, eg: 'running', 'stopped', 'deallocated' # powerstate: the VM's current power state, eg: 'running', 'stopped', 'deallocated'
# provisioning_state: the VM's current provisioning state, eg: 'succeeded' # provisioning_state: the VM's current provisioning state, eg: 'succeeded'
# tags: dictionary of the VM's defined tag values # tags: dictionary of the VM's defined tag values
@ -525,6 +526,13 @@ class AzureHost(object):
if self._hostvars != {}: if self._hostvars != {}:
return self._hostvars return self._hostvars
system = "unknown"
if 'osProfile' in self._vm_model['properties']:
if 'linuxConfiguration' in self._vm_model['properties']['osProfile']:
system = 'linux'
if 'windowsConfiguration' in self._vm_model['properties']['osProfile']:
system = 'windows'
new_hostvars = dict( new_hostvars = dict(
public_ipv4_addresses=[], public_ipv4_addresses=[],
public_dns_hostnames=[], public_dns_hostnames=[],
@ -537,6 +545,9 @@ class AzureHost(object):
tags=self._vm_model.get('tags', {}), tags=self._vm_model.get('tags', {}),
resource_type=self._vm_model.get('type', "unknown"), resource_type=self._vm_model.get('type', "unknown"),
vmid=self._vm_model['properties']['vmId'], vmid=self._vm_model['properties']['vmId'],
os_profile=dict(
system=system,
),
vmss=dict( vmss=dict(
id=self._vmss['id'], id=self._vmss['id'],
name=self._vmss['name'], name=self._vmss['name'],