diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 13:49:08 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-05 13:49:08 -0400 |
| commit | 9fd4af295a7c88b4c112b9bd500e396a766b3dc0 (patch) | |
| tree | c86ab69cda7d6a1402c779968bb20b41c8fd4012 /inventory/openstack/hosts | |
| parent | 7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (diff) | |
| parent | 3073d1f729f9dcd202088f6b318b465567c6344b (diff) | |
| download | openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.gz openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.bz2 openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.xz openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.zip | |
Merge pull request #654 from openshift/revert-641-gce-support
Revert "GCE support" because it breaks openstack.
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 3197a57bc..d5bd8d1ee 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.path.join(os.path.dirname(os.path.realpath(__file__)), "nova.ini"), +NOVA_CONFIG_FILES = [os.getcwd() + "/nova.ini", os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/nova.ini")), "/etc/ansible/nova.ini"] |