From 08ba18668b2822e9cceed5078693dccc2e98cdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pawe=C5=82=20G=C5=82azik?= Date: Tue, 25 Mar 2014 16:10:04 +0100 Subject: [PATCH 1/2] Strip() vault password file --- bin/ansible-playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index be178a6565c..9ab89c6f1e2 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -122,7 +122,7 @@ def main(args): this_path = os.path.expanduser(options.vault_password_file) try: f = open(this_path, "rb") - tmp_vault_pass=f.read() + tmp_vault_pass=f.read().strip() f.close() except (OSError, IOError), e: raise errors.AnsibleError("Could not read %s: %s" % (this_path, e)) From 6b53ac8a9ae4398f9a989e5968d9db311ef4b981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pawe=C5=82=20G=C5=82azik?= Date: Tue, 25 Mar 2014 16:10:33 +0100 Subject: [PATCH 2/2] strip() vault password file --- bin/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ansible b/bin/ansible index 0189355ddbf..426670e1faf 100755 --- a/bin/ansible +++ b/bin/ansible @@ -128,7 +128,7 @@ class Cli(object): this_path = os.path.expanduser(options.vault_password_file) try: f = open(this_path, "rb") - tmp_vault_pass=f.read() + tmp_vault_pass=f.read().strip() f.close() except (OSError, IOError), e: raise errors.AnsibleError("Could not read %s: %s" % (this_path, e))