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

Merge pull request #452 from ryanpetrello/fix-7609

Browse Source 
disable GCE inventory caching w/ a .ini file
This commit is contained in:
Ryan Petrello
2017-09-22 09:38:38 -04:00
committed by Matthew Jones
parent f84e42ed15 94b4dabee2
commit 4510cd11db
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,12 +177,6 @@ class AnsibleInventoryLoader(object):
base_args = self.get_base_args() base_args = self.get_base_args()
logger.info('Reading Ansible inventory source: %s', self.source) logger.info('Reading Ansible inventory source: %s', self.source)
# by default, the GCE inventory source caches results on disk for
# 5 minutes; disable this behavior
# https://github.com/ansible/tower/blob/cfb633e8a643b0190fa07b6204b339a1d336cbb3/awx/plugins/inventory/gce.py#L115
if self.source.endswith('gce.py'):
base_args += ['--refresh-cache']
data = self.command_to_json(base_args + ['--list']) data = self.command_to_json(base_args + ['--list'])
# TODO: remove after we run custom scripts through ansible-inventory # TODO: remove after we run custom scripts through ansible-inventory

10
awx/main/tasks.py
View File

@@ -1881,6 +1881,16 @@ class RunInventoryUpdate(BaseTask):
env['GCE_PROJECT'] = passwords.get('source_project', '') env['GCE_PROJECT'] = passwords.get('source_project', '')
env['GCE_PEM_FILE_PATH'] = cloud_credential env['GCE_PEM_FILE_PATH'] = cloud_credential
env['GCE_ZONE'] = inventory_update.source_regions if inventory_update.source_regions != 'all' else '' env['GCE_ZONE'] = inventory_update.source_regions if inventory_update.source_regions != 'all' else ''
# by default, the GCE inventory source caches results on disk for
# 5 minutes; disable this behavior
cp = ConfigParser.ConfigParser()
cp.add_section('cache')
cp.set('cache', 'cache_max_age', '0')
handle, path = tempfile.mkstemp(dir=kwargs.get('private_data_dir', None))
cp.write(os.fdopen(handle, 'w'))
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
env['GCE_INI_PATH'] = path
elif inventory_update.source == 'openstack': elif inventory_update.source == 'openstack':
env['OS_CLIENT_CONFIG_FILE'] = cloud_credential env['OS_CLIENT_CONFIG_FILE'] = cloud_credential
elif inventory_update.source == 'satellite6': elif inventory_update.source == 'satellite6':

6
awx/main/tests/unit/test_tasks.py
View File

@@ -1319,6 +1319,12 @@ class TestInventoryUpdateCredentials(TestJobExecution):
assert env['GCE_ZONE'] == expected_gce_zone assert env['GCE_ZONE'] == expected_gce_zone
ssh_key_data = env['GCE_PEM_FILE_PATH'] ssh_key_data = env['GCE_PEM_FILE_PATH']
assert open(ssh_key_data, 'rb').read() == self.EXAMPLE_PRIVATE_KEY assert open(ssh_key_data, 'rb').read() == self.EXAMPLE_PRIVATE_KEY
config = ConfigParser.ConfigParser()
config.read(env['GCE_INI_PATH'])
assert 'cache' in config.sections()
assert config.getint('cache', 'cache_max_age') == 0
return ['successful', 0] return ['successful', 0]
self.run_pexpect.side_effect = run_pexpect_side_effect self.run_pexpect.side_effect = run_pexpect_side_effect