mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 13:50:22 -07:00
Fix all other calls to yaml
This commit is contained in:
parent
427b8dc78d
commit
3fc87e011b
3 changed files with 10 additions and 9 deletions
|
@ -200,7 +200,7 @@ class Play(object):
|
||||||
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'vars')))
|
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'vars')))
|
||||||
vars_data = {}
|
vars_data = {}
|
||||||
if os.path.isfile(vars):
|
if os.path.isfile(vars):
|
||||||
vars_data = utils.parse_yaml_from_file(vars)
|
vars_data = utils.parse_yaml_from_file(vars, vault_password=self.vault_password)
|
||||||
if vars_data:
|
if vars_data:
|
||||||
if not isinstance(vars_data, dict):
|
if not isinstance(vars_data, dict):
|
||||||
raise errors.AnsibleError("vars from '%s' are not a dict" % vars)
|
raise errors.AnsibleError("vars from '%s' are not a dict" % vars)
|
||||||
|
@ -208,12 +208,12 @@ class Play(object):
|
||||||
defaults = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'defaults')))
|
defaults = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'defaults')))
|
||||||
defaults_data = {}
|
defaults_data = {}
|
||||||
if os.path.isfile(defaults):
|
if os.path.isfile(defaults):
|
||||||
defaults_data = utils.parse_yaml_from_file(defaults)
|
defaults_data = utils.parse_yaml_from_file(defaults, vault_password=self.vault_password)
|
||||||
# the meta directory contains the yaml that should
|
# the meta directory contains the yaml that should
|
||||||
# hold the list of dependencies (if any)
|
# hold the list of dependencies (if any)
|
||||||
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'meta')))
|
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'meta')))
|
||||||
if os.path.isfile(meta):
|
if os.path.isfile(meta):
|
||||||
data = utils.parse_yaml_from_file(meta)
|
data = utils.parse_yaml_from_file(meta, vault_password=self.vault_password)
|
||||||
if data:
|
if data:
|
||||||
dependencies = data.get('dependencies',[])
|
dependencies = data.get('dependencies',[])
|
||||||
if dependencies is None:
|
if dependencies is None:
|
||||||
|
@ -223,7 +223,7 @@ class Play(object):
|
||||||
(dep_path,dep_vars) = self._get_role_path(dep)
|
(dep_path,dep_vars) = self._get_role_path(dep)
|
||||||
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'meta')))
|
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'meta')))
|
||||||
if os.path.isfile(meta):
|
if os.path.isfile(meta):
|
||||||
meta_data = utils.parse_yaml_from_file(meta)
|
meta_data = utils.parse_yaml_from_file(meta, vault_password=self.vault_password)
|
||||||
if meta_data:
|
if meta_data:
|
||||||
allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
|
allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
|
||||||
|
|
||||||
|
@ -244,13 +244,13 @@ class Play(object):
|
||||||
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars')))
|
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars')))
|
||||||
vars_data = {}
|
vars_data = {}
|
||||||
if os.path.isfile(vars):
|
if os.path.isfile(vars):
|
||||||
vars_data = utils.parse_yaml_from_file(vars)
|
vars_data = utils.parse_yaml_from_file(vars, vault_password=self.vault_password)
|
||||||
if vars_data:
|
if vars_data:
|
||||||
dep_vars = utils.combine_vars(vars_data, dep_vars)
|
dep_vars = utils.combine_vars(vars_data, dep_vars)
|
||||||
defaults = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'defaults')))
|
defaults = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'defaults')))
|
||||||
dep_defaults_data = {}
|
dep_defaults_data = {}
|
||||||
if os.path.isfile(defaults):
|
if os.path.isfile(defaults):
|
||||||
dep_defaults_data = utils.parse_yaml_from_file(defaults)
|
dep_defaults_data = utils.parse_yaml_from_file(defaults, vault_password=self.vault_password)
|
||||||
if 'role' in dep_vars:
|
if 'role' in dep_vars:
|
||||||
del dep_vars['role']
|
del dep_vars['role']
|
||||||
|
|
||||||
|
@ -305,7 +305,7 @@ class Play(object):
|
||||||
default_vars = {}
|
default_vars = {}
|
||||||
for filename in defaults_files:
|
for filename in defaults_files:
|
||||||
if os.path.exists(filename):
|
if os.path.exists(filename):
|
||||||
new_default_vars = utils.parse_yaml_from_file(filename)
|
new_default_vars = utils.parse_yaml_from_file(filename, vault_password=self.vault_password)
|
||||||
if new_default_vars:
|
if new_default_vars:
|
||||||
if type(new_default_vars) != dict:
|
if type(new_default_vars) != dict:
|
||||||
raise errors.AnsibleError("%s must be stored as dictionary/hash: %s" % (filename, type(new_default_vars)))
|
raise errors.AnsibleError("%s must be stored as dictionary/hash: %s" % (filename, type(new_default_vars)))
|
||||||
|
@ -718,7 +718,7 @@ class Play(object):
|
||||||
sequence.append(filename4)
|
sequence.append(filename4)
|
||||||
if os.path.exists(filename4):
|
if os.path.exists(filename4):
|
||||||
found = True
|
found = True
|
||||||
data = utils.parse_yaml_from_file(filename4)
|
data = utils.parse_yaml_from_file(filename4, vault_password=self.vault_password)
|
||||||
if type(data) != dict:
|
if type(data) != dict:
|
||||||
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % filename4)
|
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % filename4)
|
||||||
if host is not None:
|
if host is not None:
|
||||||
|
|
|
@ -43,7 +43,7 @@ class ActionModule(object):
|
||||||
source = utils.path_dwim(self.runner.basedir, source)
|
source = utils.path_dwim(self.runner.basedir, source)
|
||||||
|
|
||||||
if os.path.exists(source):
|
if os.path.exists(source):
|
||||||
data = utils.parse_yaml_from_file(source)
|
data = utils.parse_yaml_from_file(source, vault_password=self.runner.vault_pass)
|
||||||
if type(data) != dict:
|
if type(data) != dict:
|
||||||
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % source)
|
raise errors.AnsibleError("%s must be stored as a dictionary/hash" % source)
|
||||||
result = dict(ansible_facts=data)
|
result = dict(ansible_facts=data)
|
||||||
|
|
|
@ -70,6 +70,7 @@ def decrypt(filename, password):
|
||||||
'''
|
'''
|
||||||
|
|
||||||
if password is None:
|
if password is None:
|
||||||
|
import epdb; epdb.st()
|
||||||
raise errors.AnsibleError("A vault password must be specified to decrypt %s" % filename)
|
raise errors.AnsibleError("A vault password must be specified to decrypt %s" % filename)
|
||||||
|
|
||||||
V = Vault(filename=filename, vault_password=password)
|
V = Vault(filename=filename, vault_password=password)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue