github/ansible-later
0
0
Fork 0
mirror of https://github.com/thegeeklab/ansible-later.git synced 2024-11-22 12:50:42 +00:00
Code Issues Projects Releases Wiki Activity

remove old vault passowrd references (obsolete)

Browse Source
This commit is contained in:
Robert Kaussow 2019-06-21 11:51:02 +02:00
parent b55eee5ddf
commit 031bbc93ad
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansiblelater/utils/yamlhelper.py
View File

@ -50,16 +50,9 @@ except ImportError:
# Fallback on the Ansible 1.9 module # Fallback on the Ansible 1.9 module
from ansible.module_utils.splitter import split_args from ansible.module_utils.splitter import split_args
# ansible-later doesn't need/want to know about encrypted secrets, but it needs
# Ansible 2.3+ allows encrypted secrets within yaml files, so we pass a string
# as the password to enable such yaml files to be opened and parsed successfully.
DEFAULT_VAULT_PASSWORD = "x"
def parse_yaml_from_file(filepath): def parse_yaml_from_file(filepath):
dl = DataLoader() dl = DataLoader()
if hasattr(dl, "set_vault_password"):
dl.set_vault_password(DEFAULT_VAULT_PASSWORD)
return dl.load_from_file(filepath) return dl.load_from_file(filepath)
@ -485,8 +478,6 @@ def parse_yaml_linenumbers(data, filename):
try: try:
kwargs = {} kwargs = {}
if "vault_password" in inspect.getargspec(AnsibleLoader.__init__).args:
kwargs["vault_password"] = DEFAULT_VAULT_PASSWORD
loader = AnsibleLoader(data, **kwargs) loader = AnsibleLoader(data, **kwargs)
loader.compose_node = compose_node loader.compose_node = compose_node
loader.construct_mapping = construct_mapping loader.construct_mapping = construct_mapping