Merge pull request #586 from tima/env-private-key-fix

The default private key file was getting set incorrectly from environment variables. My bad.
12 years ago · fd0ed04d19
parent b1c0fcd1d3 84fa9dcaee
commit fd0ed04d19
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@ -34,7 +34,7 @@ DEFAULT_TIMEOUT        = os.environ.get('ANSIBLE_TIMEOUT',10)
 DEFAULT_POLL_INTERVAL  = os.environ.get('ANSIBLE_POLL_INTERVAL',15)
 DEFAULT_REMOTE_USER    = os.environ.get('ANSIBLE_REMOTE_USER','root')
 DEFAULT_REMOTE_PASS    = None
-DEFAULT_PRIVATE_KEY_FILE    = os.environ.get('ANSIBLE_REMOTE_USER',None)
+DEFAULT_PRIVATE_KEY_FILE    = os.environ.get('ANSIBLE_PRIVATE_KEY_FILE',None)
 DEFAULT_SUDO_PASS      = None
 DEFAULT_SUDO_USER      = os.environ.get('ANSIBLE_SUDO_USER','root')
 DEFAULT_REMOTE_PORT    = 22