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

Revert default EE authfile support for inventory_import

Browse Source
This commit is contained in:
Alan Rominger 2021-10-29 09:27:42 -04:00 committed by Shane McDonald
parent d42fe921db
commit 0d1f8a06ce
No known key found for this signature in database
GPG Key ID: 6F374AF6E9EB9374
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
awx/main/management/commands/inventory_import.py
View File

@ -2,15 +2,12 @@
# All Rights Reserved.
# Python
from base64 import b64encode
import json
import logging
import os
import re
import stat
import subprocess
import sys
import tempfile
import time
import traceback
from collections import OrderedDict
@ -81,21 +78,6 @@ class AnsibleInventoryLoader(object):
bargs.extend(['-e', '{0}={1}'.format(key, value)])
ee = get_default_execution_environment()
if ee.credential:
if not ee.credential.has_inputs(field_names=('host', 'username', 'password')):
raise RuntimeError(f"Registry credential for execution environment `{ee}` is missing either the host, username, or password.")
host = ee.credential.get_input('host')
username = ee.credential.get_input('username')
password = ee.credential.get_input('password')
token = f"{username}:{password}"
auth_data = {'auths': {host: {'auth': b64encode(token.encode('utf-8')).decode('utf-8')}}}
self.authfile.write(json.dumps(auth_data, indent=4).encode('utf-8'))
bargs.append(f'--authfile={self.authfile.name}')
if ee.pull:
bargs.append(f'--pull={ee.pull}')
bargs.extend([ee.image])
bargs.extend(['ansible-inventory', '-i', self.source])
@ -131,12 +113,9 @@ class AnsibleInventoryLoader(object):
return data
def load(self):
with tempfile.NamedTemporaryFile() as f:
self.authfile = f
os.chmod(self.authfile.name, stat.S_IRUSR | stat.S_IWUSR)
base_args = self.get_base_args()
logger.info('Reading Ansible inventory source: %s', self.source)
return self.command_to_json(base_args)
base_args = self.get_base_args()
logger.info('Reading Ansible inventory source: %s', self.source)
return self.command_to_json(base_args)
class Command(BaseCommand):