From 598d9355d0ae4088f6afb11a1a12821efd0939f5 Mon Sep 17 00:00:00 2001
From: John T Skarbek <jtslear@gmail.com>
Date: Wed, 5 Aug 2015 20:33:33 -0400
Subject: Removes hardcoded python2
* replaces the hard coded items in favor of pulling a users environment
* resolves #383
* Feedback and/or additional testing is more than welcome
---
inventory/openstack/hosts/hosts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'inventory/openstack')
diff --git a/inventory/openstack/hosts/hosts b/inventory/openstack/hosts/hosts
index 9cdc31449..2d2194a4d 100644
--- a/inventory/openstack/hosts/hosts
+++ b/inventory/openstack/hosts/hosts
@@ -1 +1 @@
-localhost ansible_sudo=no ansible_python_interpreter=/usr/bin/python2 connection=local
+localhost ansible_sudo=no ansible_python_interpreter='/usr/bin/env python2' connection=local
--
cgit v1.2.3
From a22fbd327ab9decda9543d47c1ba375b9faecffd Mon Sep 17 00:00:00 2001
From: Chengcheng Mu <chengcheng.mu@amadeus.com>
Date: Tue, 18 Aug 2015 10:46:23 +0200
Subject: GCE-support (more information in PR, README_GCE.md)
---
inventory/openstack/hosts/nova.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'inventory/openstack')
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"]
--
cgit v1.2.3
From 3073d1f729f9dcd202088f6b318b465567c6344b Mon Sep 17 00:00:00 2001
From: Thomas Wiest <twiest@users.noreply.github.com>
Date: Mon, 5 Oct 2015 13:48:41 -0400
Subject: Revert "GCE support"
---
inventory/openstack/hosts/nova.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'inventory/openstack')
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"]
--
cgit v1.2.3
From a3ba0278879075e14373a6872acc5f0c3cc3d9a2 Mon Sep 17 00:00:00 2001
From: Chengcheng Mu <chengcheng.mu@amadeus.com>
Date: Tue, 6 Oct 2015 16:59:00 +0200
Subject: Revert "Revert "GCE support""
This reverts commit 3073d1f729f9dcd202088f6b318b465567c6344b.
---
inventory/openstack/hosts/nova.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'inventory/openstack')
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"]
--
cgit v1.2.3