diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-06 16:59:00 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-06 16:59:00 +0200 |
| commit | a3ba0278879075e14373a6872acc5f0c3cc3d9a2 (patch) | |
| tree | 3c0a829dabf217cbabb77075153664e869d4bcda /inventory/openstack | |
| parent | 071eee9acb80621919dda2a07f9fe9c56dcfda27 (diff) | |
| download | openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.gz openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.bz2 openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.tar.xz openshift-a3ba0278879075e14373a6872acc5f0c3cc3d9a2.zip | |
Revert "Revert "GCE support""
This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
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"] |