diff options
author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-08-18 10:46:23 +0200 |
---|---|---|
committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 13:49:10 +0200 |
commit | a22fbd327ab9decda9543d47c1ba375b9faecffd (patch) | |
tree | 8c1c0cb011980a015fd798612777eece523b5753 /inventory/openstack | |
parent | 6f5fff8a542d544916427ce625fe46ec31fa76d3 (diff) | |
download | openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.gz openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.bz2 openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.tar.xz openshift-a22fbd327ab9decda9543d47c1ba375b9faecffd.zip |
GCE-support (more information in PR, README_GCE.md)
Diffstat (limited to 'inventory/openstack')
-rwxr-xr-x | inventory/openstack/hosts/nova.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inventory/openstack/hosts/nova.py b/inventory/openstack/hosts/nova.py index d5bd8d1ee..3197a57bc 100755 --- a/inventory/openstack/hosts/nova.py +++ b/inventory/openstack/hosts/nova.py @@ -34,7 +34,7 @@ except ImportError: # executed with no parameters, return the list of # all groups and hosts -NOVA_CONFIG_FILES = [os.getcwd() + "/nova.ini", +NOVA_CONFIG_FILES = [os.path.join(os.path.dirname(os.path.realpath(__file__)), "nova.ini"), os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/nova.ini")), "/etc/ansible/nova.ini"] |