External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 19:50:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add backwards compatibility for injecting single file

Browse Source
This commit is contained in:
Jim Ladd
2017-11-21 11:00:31 -05:00
parent 286a70f2ca
commit 7aa1ae69b3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/fields.py
View File

@@ -696,7 +696,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
'file': { 'file': {
'type': 'object', 'type': 'object',
'patternProperties': { 'patternProperties': {
'^template\.[a-zA-Z_]+$': {'type': 'string'}, '^template(\.[a-zA-Z_]+)?$': {'type': 'string'},
}, },
'additionalProperties': False, 'additionalProperties': False,
}, },

13
awx/main/models/credential/__init__.py
View File

@@ -597,8 +597,6 @@ class CredentialType(CommonModelNameNotUnique):
pass pass
tower_namespace = TowerNamespace() tower_namespace = TowerNamespace()
filename_namespace = TowerNamespace()
tower_namespace.filename = filename_namespace
# maintain a normal namespace for building the ansible-playbook arguments (env and args) # maintain a normal namespace for building the ansible-playbook arguments (env and args)
namespace = {'tower': tower_namespace} namespace = {'tower': tower_namespace}
@@ -634,8 +632,15 @@ class CredentialType(CommonModelNameNotUnique):
with open(path, 'w') as f: with open(path, 'w') as f:
f.write(data) f.write(data)
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR) os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
file_label = file_label.split('.')[1]
setattr(namespace['tower'].filename, file_label, path) # determine if filename indicates single file or many
if file_label.find('.') == -1:
tower_namespace.filename = path
else:
if not hasattr(tower_namespace, 'filename'):
tower_namespace.filename = TowerNamespace()
file_label = file_label.split('.')[1]
setattr(tower_namespace.filename, file_label, path)
for env_var, tmpl in self.injectors.get('env', {}).items(): for env_var, tmpl in self.injectors.get('env', {}).items():
if env_var.startswith('ANSIBLE_') or env_var in self.ENV_BLACKLIST: if env_var.startswith('ANSIBLE_') or env_var in self.ENV_BLACKLIST: