summaryrefslogtreecommitdiffstats
path: root/inventory
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
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')
-rwxr-xr-xinventory/gce/hosts/gce.py9
-rwxr-xr-xinventory/openstack/hosts/nova.py2
2 files changed, 7 insertions, 4 deletions
diff --git a/inventory/gce/hosts/gce.py b/inventory/gce/hosts/gce.py
index 3403f735e..6ed12e011 100755
--- a/inventory/gce/hosts/gce.py
+++ b/inventory/gce/hosts/gce.py
@@ -120,6 +120,7 @@ class GceInventory(object):
os.path.dirname(os.path.realpath(__file__)), "gce.ini")
gce_ini_path = os.environ.get('GCE_INI_PATH', gce_ini_default_path)
+
# Create a ConfigParser.
# This provides empty defaults to each key, so that environment
# variable configuration (as opposed to INI configuration) is able
@@ -173,6 +174,7 @@ class GceInventory(object):
args[1] = os.environ.get('GCE_PEM_FILE_PATH', args[1])
kwargs['project'] = os.environ.get('GCE_PROJECT', kwargs['project'])
+
# Retrieve and return the GCE driver.
gce = get_driver(Provider.GCE)(*args, **kwargs)
gce.connection.user_agent_append(
@@ -211,7 +213,8 @@ class GceInventory(object):
'gce_image': inst.image,
'gce_machine_type': inst.size,
'gce_private_ip': inst.private_ips[0],
- 'gce_public_ip': inst.public_ips[0],
+ # Hosts don't always have a public IP name
+ #'gce_public_ip': inst.public_ips[0],
'gce_name': inst.name,
'gce_description': inst.extra['description'],
'gce_status': inst.extra['status'],
@@ -219,8 +222,8 @@ class GceInventory(object):
'gce_tags': inst.extra['tags'],
'gce_metadata': md,
'gce_network': net,
- # Hosts don't have a public name, so we add an IP
- 'ansible_ssh_host': inst.public_ips[0]
+ # Hosts don't always have a public IP name
+ #'ansible_ssh_host': inst.public_ips[0]
}
def get_instance(self, instance_name):
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"]