External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove the old version checks from our job runners used to test features

Browse Source 
of old Ansible versions:

* INVENTORY_HOSTVARS from pre-1.3
* Vault password prompting from pre-1.5
* Git hostkey acceptance from pre-1.5
This commit is contained in:
Matthew Jones
2015-03-26 13:42:42 -04:00
parent 180a262d36
commit fe82b54158
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/tasks.py
View File

@@ -5,7 +5,6 @@
import codecs import codecs
import ConfigParser import ConfigParser
import cStringIO import cStringIO
from distutils.version import StrictVersion as Version
import json import json
import logging import logging
import os import os
@@ -565,13 +564,8 @@ class RunJob(BaseTask):
os.mkdir(cp_dir, 0700) os.mkdir(cp_dir, 0700)
env['ANSIBLE_SSH_CONTROL_PATH'] = os.path.join(cp_dir, 'ansible-ssh-%%h-%%p-%%r') env['ANSIBLE_SSH_CONTROL_PATH'] = os.path.join(cp_dir, 'ansible-ssh-%%h-%%p-%%r')
# When using Ansible >= 1.3, allow the inventory script to include host # Allow the inventory script to include host variables inline via ['_meta']['hostvars'].
# variables inline via ['_meta']['hostvars']. env['INVENTORY_HOSTVARS'] = str(True)
try:
if Version(kwargs['ansible_version']) >= Version('1.3'):
env['INVENTORY_HOSTVARS'] = str(True)
except ValueError:
pass
# Set environment variables for cloud credentials. # Set environment variables for cloud credentials.
cloud_cred = job.cloud_credential cloud_cred = job.cloud_credential
@@ -637,13 +631,9 @@ class RunJob(BaseTask):
if 'sudo_password' in kwargs.get('passwords', {}): if 'sudo_password' in kwargs.get('passwords', {}):
args.append('--ask-sudo-pass') args.append('--ask-sudo-pass')
# When using Ansible >= 1.5, support prompting for a vault password. # Support prompting for a vault password.
try: if 'vault_password' in kwargs.get('passwords', {}):
if Version(kwargs['ansible_version']) >= Version('1.5'): args.append('--ask-vault-pass')
if 'vault_password' in kwargs.get('passwords', {}):
args.append('--ask-vault-pass')
except ValueError:
pass
if job.forks: # FIXME: Max limit? if job.forks: # FIXME: Max limit?
args.append('--forks=%d' % job.forks) args.append('--forks=%d' % job.forks)
@@ -807,14 +797,9 @@ class RunProjectUpdate(BaseTask):
else: else:
scm_url = update_scm_url(scm_type, scm_url, scp_format=True) scm_url = update_scm_url(scm_type, scm_url, scp_format=True)
# When using Ansible >= 1.5, pass the extra accept_hostkey parameter to # Pass the extra accept_hostkey parameter to the git module.
# the git module.
if scm_type == 'git' and scm_url_parts.scheme.endswith('ssh'): if scm_type == 'git' and scm_url_parts.scheme.endswith('ssh'):
try: extra_vars['scm_accept_hostkey'] = 'true'
if Version(kwargs['ansible_version']) >= Version('1.5'):
extra_vars['scm_accept_hostkey'] = 'true'
except ValueError:
pass
return scm_url, extra_vars return scm_url, extra_vars