6 files changed, 2 insertions, 18 deletions
diff --git a/inventory/aws/group_vars/all b/inventory/aws/group_vars/all
new file mode 100644
index 000000000..b22da00de
--- /dev/null
+++ b/inventory/aws/group_vars/all
@@ -0,0 +1,2 @@
+---
+ansible_ssh_user: root
diff --git a/inventory/gce/group_vars/all b/inventory/gce/group_vars/all
index 3e969df63..b22da00de 100644
--- a/inventory/gce/group_vars/all
+++ b/inventory/gce/group_vars/all
@@ -1,7 +1,2 @@
 ---
 ansible_ssh_user: root
-openshift_hostname: "{{ ansible_default_ipv4.address }}"
-openshift_public_hostname: "{{ ansible_default_ipv4.address }}"
-openshift_ip: "{{ ansible_default_ipv4.address }}"
-openshift_public_ip: "{{ gce_public_ip }}"
-openshift_env: "{{ oo_env }}"
diff --git a/inventory/gce/group_vars/tag_host-type-master b/inventory/gce/group_vars/tag_host-type-master
deleted file mode 100644
index ddbdc650c..000000000
--- a/inventory/gce/group_vars/tag_host-type-master
+++ /dev/null
@@ -1,5 +0,0 @@
----
-openshift_api_url: https://{{ openshift_hostname }}:8443
-openshift_api_public_url: https://{{ openshift_public_hostname }}:8443
-openshift_webui_url: https://{{ openshift_hostname }}:8444
-openshift_webui_public_url: https://{{ openshift_public_hostname }}:8444
diff --git a/inventory/gce/group_vars/tag_host-type-node b/inventory/gce/group_vars/tag_host-type-node
deleted file mode 100644
index bb95a724d..000000000
--- a/inventory/gce/group_vars/tag_host-type-node
+++ /dev/null
@@ -1,6 +0,0 @@
----
-openshift_node_cpu:
-openshift_node_memory:
-openshift_node_pod_cidr:
-openshift_node_labels: {}
-openshift_node_annotations: {}
diff --git a/inventory/gce/group_vars/tag_host-type-openshift-master b/inventory/gce/group_vars/tag_host-type-openshift-master
deleted file mode 120000
index c0c4cf370..000000000
--- a/inventory/gce/group_vars/tag_host-type-openshift-master
+++ /dev/null
@@ -1 +0,0 @@
-tag_host-type-master
-\ No newline at end of file
diff --git a/inventory/gce/group_vars/tag_host-type-openshift-node b/inventory/gce/group_vars/tag_host-type-openshift-node
deleted file mode 120000
index ebbce6136..000000000
--- a/inventory/gce/group_vars/tag_host-type-openshift-node
+++ /dev/null
@@ -1 +0,0 @@
-tag_host-type-node
-\ No newline at end of file