summaryrefslogtreecommitdiffstats
path: root/inventory/openstack/hosts
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-10-12 14:37:44 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-10-12 14:37:44 -0400
commit35476982e1d0dc1851c102ab3b6aec0b9b6a1637 (patch)
tree0d7de94740f3fafe9eeb9754d5d438036f35e15a /inventory/openstack/hosts
parent8e776b09cb38c6f02aa4b3c75c9343e73fb96691 (diff)
parenta8171a639bd4500f30e72233587e9f6335202438 (diff)
downloadopenshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.gz
openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.bz2
openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.tar.xz
openshift-35476982e1d0dc1851c102ab3b6aec0b9b6a1637.zip
Merge pull request #658 from menren/gce-support
GCE-support
Diffstat (limited to 'inventory/openstack/hosts')
-rwxr-xr-xinventory/openstack/hosts/nova.py2
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"]