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

Merge pull request #8007 from msabramo/nova.py_set_defaults

Browse source 
nova.py: Set defaults for OpenStack settings
This commit is contained in:
James Cammarata 2014-07-05 00:36:18 -05:00
commit 366b39cfc1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/inventory/nova.py
View file

@ -36,8 +36,14 @@ NOVA_CONFIG_FILES = [os.getcwd() + "/nova.ini",
os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/nova.ini")), os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/nova.ini")),
"/etc/ansible/nova.ini"] "/etc/ansible/nova.ini"]
NOVA_DEFAULTS = {
'auth_system': None,
'region_name': None,
}
def nova_load_config_file(): def nova_load_config_file():
p = ConfigParser.SafeConfigParser() p = ConfigParser.SafeConfigParser(NOVA_DEFAULTS)
for path in NOVA_CONFIG_FILES: for path in NOVA_CONFIG_FILES:
if os.path.exists(path): if os.path.exists(path):