External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1235 from AlanCoding/rm_TOWER_HOST

Browse Source 
remove TOWER_HOST from job env vars
This commit is contained in:
Alan Rominger
2018-04-04 10:42:16 -04:00
committed by GitHub
parent 2b7ad578d5 c064195025
commit c2446beb6e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/tasks.py
View File

@@ -1166,7 +1166,6 @@ class RunJob(BaseTask):
if not kwargs.get('isolated'): if not kwargs.get('isolated'):
env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_path env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_path
env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display' env['ANSIBLE_STDOUT_CALLBACK'] = 'awx_display'
env['TOWER_HOST'] = settings.TOWER_URL_BASE
env['AWX_HOST'] = settings.TOWER_URL_BASE env['AWX_HOST'] = settings.TOWER_URL_BASE
env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else '' env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else ''

3
docs/CHANGELOG.md
View File

@@ -62,3 +62,6 @@
* Saved Launch-time configurations feature - added WFJT node promptable fields to schedules, * Saved Launch-time configurations feature - added WFJT node promptable fields to schedules,
added `extra_data` to WFJT nodes, added "schedule this job" endpoint. added `extra_data` to WFJT nodes, added "schedule this job" endpoint.
[[#169](https://github.com/ansible/awx/issues/169)] [[#169](https://github.com/ansible/awx/issues/169)]
* Removed `TOWER_HOST` as a default environment variable in job running environment
due to conflict with tower credential type. Playbook authors should replace their
use with `AWX_HOST`. [[#1727](https://github.com/ansible/awx/issues/1727)]