External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 14:39:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Mass rename foreman -> satellite6

Browse Source 
For end-user facing elements. We still maintain foreman for some
underlying logic needed by the modules
This commit is contained in:
Matthew Jones
2016-06-15 11:15:33 -04:00
parent dc0494535e
commit 9b49ff15bd
13 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -1275,7 +1275,7 @@ class RunInventoryUpdate(BaseTask):
for k,v in vmware_opts.items():
cp.set(section, k, unicode(v))
elif inventory_update.source == 'foreman':
elif inventory_update.source == 'satellite6':
section = 'foreman'
cp.add_section(section)
@@ -1406,7 +1406,7 @@ class RunInventoryUpdate(BaseTask):
env['GCE_ZONE'] = inventory_update.source_regions
elif inventory_update.source == 'openstack':
env['OS_CLIENT_CONFIG_FILE'] = cloud_credential
elif inventory_update.source == 'foreman':
elif inventory_update.source == 'satellite6':
env['FOREMAN_INI_PATH'] = cloud_credential
elif inventory_update.source == 'cloudforms':
env['CLOUDFORMS_INI_PATH'] = cloud_credential