From 97703d39688632ba0d6bdfdcea74feda618688c0 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 5 Jul 2013 22:15:36 -0400 Subject: [PATCH 1/2] AWX should not record host keys in paramiko mode because it is /very/ slow. --- awx/main/tasks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 5201d9ef6d..4def33ee32 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -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): From a6fe88cc3ca47a85bb264c2f72759ea0820b9475 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Sun, 7 Jul 2013 18:35:22 -0400 Subject: [PATCH 2/2] Fixing Makefile for deb builds * Minor issue due to fixing up the RELEASE variable related to the sdist tarball name the "make deb" command expected --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 82b75a609b..b61f420d9c 100644 --- a/Makefile +++ b/Makefile @@ -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