cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Port vault-keyring.py to properly load the config. Fixes #31304 (#31315)

Browse source
This commit is contained in:
Matt Martz 2017-10-13 12:46:24 -05:00 committed by Adrian Likins
parent ecee475a3a
commit e2f16cfaf7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/vault/vault-keyring.py
View file

@ -65,20 +65,20 @@ import sys
import getpass
import keyring
import ansible.constants as C
from ansible.config.manager import ConfigManager, get_ini_config_value
def main():
(parser, config_path) = C.load_config_file()
if parser.has_option('vault', 'username'):
username = parser.get('vault', 'username')
else:
username = getpass.getuser()
config = ConfigManager()
username = get_ini_config_value(
config._parser,
dict(section='vault', key='username')
) or getpass.getuser()
if parser.has_option('vault', 'keyname'):
keyname = parser.get('vault', 'keyname')
else:
keyname = 'ansible'
keyname = get_ini_config_value(
config._parser,
dict(section='vault', key='keyname')
) or 'ansible'
if len(sys.argv) == 2 and sys.argv[1] == 'set':
intro = 'Storing password in "{}" user keyring using key name: {}\n'