summaryrefslogtreecommitdiff
path: root/morphlib/plugins/deploy_plugin.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-22 09:33:11 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-22 09:33:11 +0100
commite62eced3044c2383de3029e9d7ae2b2649704e80 (patch)
treeefa3c8c7c10be3596f0b1ae4531841e4779e7e25 /morphlib/plugins/deploy_plugin.py
parenta32de7934cce79dda2b8dc20be1c5ec94109869e (diff)
parentef3a9aa55f70d6c56a6e94be5e15b54decae1a74 (diff)
downloadmorph-e62eced3044c2383de3029e9d7ae2b2649704e80.tar.gz
Merge remote-tracking branch 'origin/sam/avoid-logging-passwords-from-env-v2'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
-rw-r--r--morphlib/plugins/deploy_plugin.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index a80079fa..2bc53a0d 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -591,8 +591,7 @@ class DeployPlugin(cliapp.Plugin):
'''
def remove_passwords(env):
- def is_password(key):
- return 'PASSWORD' in key
+ is_password = morphlib.util.env_variable_is_password
return { k:v for k, v in env.iteritems() if not is_password(k) }
meta = {