diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 09:26:52 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 09:26:52 -0400 |
| commit | 7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (patch) | |
| tree | 5dc2cb028bddf76e98ff53d333535212d6fd8b3b /inventory/openstack/hosts | |
| parent | c443f3fc1b901b72a58e0e28b5a280cec205cbbd (diff) | |
| parent | 59fb7879501d702bb78a1d79326408b115a63c90 (diff) | |
| download | openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.gz openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.bz2 openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.tar.xz openshift-7918909dc7c6877a4ce2b9fab830d0c41c1c92fd.zip | |
Merge pull request #641 from menren/gce-support
GCE support
Diffstat (limited to 'inventory/openstack/hosts')
| -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"] |