External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 03:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Allow use of fallback instance_ids

Browse Source
This commit is contained in:
AlanCoding
2019-04-04 12:20:35 -04:00
committed by Jim Ladd
parent 3ae4417af4
commit 1970fac989
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/management/commands/inventory_import.py
View File

@@ -271,7 +271,7 @@ class Command(BaseCommand):
logging.DEBUG, 0])) logging.DEBUG, 0]))
logger.setLevel(log_levels.get(self.verbosity, 0)) logger.setLevel(log_levels.get(self.verbosity, 0))
def _get_instance_id(self, from_dict, default=''): def _get_instance_id(self, variables, default=''):
''' '''
Retrieve the instance ID from the given dict of host variables. Retrieve the instance ID from the given dict of host variables.
@@ -279,15 +279,23 @@ class Command(BaseCommand):
the lookup will traverse into nested dicts, equivalent to: the lookup will traverse into nested dicts, equivalent to:
from_dict.get('foo', {}).get('bar', default) from_dict.get('foo', {}).get('bar', default)
Multiple ID variables may be specified as 'foo.bar,foobar', so that
it will first try to find 'bar' inside of 'foo', and if unable,
will try to find 'foobar' as a fallback
''' '''
instance_id = default instance_id = default
if getattr(self, 'instance_id_var', None): if getattr(self, 'instance_id_var', None):
for key in self.instance_id_var.split('.'): for single_instance_id in self.instance_id_var.split(','):
if not hasattr(from_dict, 'get'): from_dict = variables
instance_id = default for key in single_instance_id.split('.'):
if not hasattr(from_dict, 'get'):
instance_id = default
break
instance_id = from_dict.get(key, default)
from_dict = instance_id
if instance_id:
break break
instance_id = from_dict.get(key, default)
from_dict = instance_id
return smart_text(instance_id) return smart_text(instance_id)
def _get_enabled(self, from_dict, default=None): def _get_enabled(self, from_dict, default=None):
@@ -422,7 +430,7 @@ class Command(BaseCommand):
for mem_host in self.all_group.all_hosts.values(): for mem_host in self.all_group.all_hosts.values():
instance_id = self._get_instance_id(mem_host.variables) instance_id = self._get_instance_id(mem_host.variables)
if not instance_id: if not instance_id:
logger.warning('Host "%s" has no "%s" variable', logger.warning('Host "%s" has no "%s" variable(s)',
mem_host.name, self.instance_id_var) mem_host.name, self.instance_id_var)
continue continue
mem_host.instance_id = instance_id mem_host.instance_id = instance_id

2
awx/settings/defaults.py
View File

@@ -702,7 +702,7 @@ EC2_ENABLED_VAR = 'ec2_state'
EC2_ENABLED_VALUE = 'running' EC2_ENABLED_VALUE = 'running'
# Inventory variable name containing unique instance ID. # Inventory variable name containing unique instance ID.
EC2_INSTANCE_ID_VAR = 'ec2_id' EC2_INSTANCE_ID_VAR = 'ec2_id,instance_id'
# Filter for allowed group/host names when importing inventory from EC2. # Filter for allowed group/host names when importing inventory from EC2.
EC2_GROUP_FILTER = r'^.+$' EC2_GROUP_FILTER = r'^.+$'