summaryrefslogtreecommitdiffstats
path: root/inventory/gce
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-04-24 14:06:02 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-04-24 14:06:02 -0400
commit196d37e2ffa0d7f4221a857b143fd09f84a9d00b (patch)
tree4c5413c72a2dd2ec732730b6994a104cca6a9798 /inventory/gce
parent7f7b582a7bc239e69c147b98c8c2512050f12851 (diff)
parent8ce5e1de898d2fd2c4aa4620f31b57b62ed0c5d6 (diff)
downloadopenshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.gz
openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.bz2
openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.tar.xz
openshift-196d37e2ffa0d7f4221a857b143fd09f84a9d00b.zip
Merge pull request #187 from openshift/master
Merge master into INT
Diffstat (limited to 'inventory/gce')
-rw-r--r--inventory/gce/group_vars/all2
-rwxr-xr-xinventory/gce/hosts/gce.py (renamed from inventory/gce/gce.py)0
-rw-r--r--inventory/gce/hosts/hosts1
3 files changed, 1 insertions, 2 deletions
diff --git a/inventory/gce/group_vars/all b/inventory/gce/group_vars/all
deleted file mode 100644
index b22da00de..000000000
--- a/inventory/gce/group_vars/all
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ansible_ssh_user: root
diff --git a/inventory/gce/gce.py b/inventory/gce/hosts/gce.py
index 3403f735e..3403f735e 100755
--- a/inventory/gce/gce.py
+++ b/inventory/gce/hosts/gce.py
diff --git a/inventory/gce/hosts/hosts b/inventory/gce/hosts/hosts
new file mode 100644
index 000000000..34a4396bd
--- /dev/null
+++ b/inventory/gce/hosts/hosts
@@ -0,0 +1 @@
+localhost ansible_connection=local ansible_sudo=no ansible_python_interpreter=/usr/bin/python2