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

Merge branch 'master' of https://github.com/ansible/ansible-commander

Browse Source
This commit is contained in:
chouseknecht 2013-07-08 10:45:08 -04:00
commit 5380ebf416
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -159,7 +159,7 @@ deb: sdist
@mkdir -p deb-build
@cp dist/$(SDIST_TAR_FILE) deb-build/
(cd deb-build && tar zxf $(SDIST_TAR_FILE))
(cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../awx-$(VERSION)-$(BUILD).tar.gz -p awx-$(VERSION)-$(BUILD))
(cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../$(SDIST_TAR_FILE) -p awx-$(VERSION))
@rm -rf $(DEB_BUILD_DIR)/debian
@cp -a packaging/debian $(DEB_BUILD_DIR)/
@echo "awx_$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles

3
awx/main/tasks.py
View File

@ -90,7 +90,10 @@ class RunJob(Task):
env['REST_API_URL'] = settings.INTERNAL_API_URL
env['REST_API_TOKEN'] = job.task_auth_token or ''
env['ANSIBLE_NOCOLOR'] = '1' # Prevent output of escape sequences.
# do not want AWX to ask interactive questions and want it to be friendly with reprovisioning
env['ANSIBLE_HOST_KEY_CHECKING'] = 'False'
# RHEL has too old of an SSH so ansible will select paramiko and this is VERY slow
env['ANSIBLE_PARAMIKO_RECORD_HOST_KEYS'] = False
return env
def build_args(self, job, **kwargs):