summaryrefslogtreecommitdiffstats
path: root/inventory/gce
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-23 23:53:17 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-04-03 14:51:26 -0400
commit4712e72c912a1102bff0508c98bd97da3f33ae95 (patch)
tree04a2bfebd3ac8b746150921bd134dbde70a9a56a /inventory/gce
parent59e69dd21c19bf745392b5e83bd652630ee870cc (diff)
downloadopenshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.gz
openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.bz2
openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.xz
openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.zip
openshift_facts role/module refactor default settings
- Add openshift_facts role and module - Created new role openshift_facts that contains an openshift_facts module - Refactor openshift_* roles to use openshift_facts instead of relying on defaults - Refactor playbooks to use openshift_facts - Cleanup inventory group_vars - Update defaults - update openshift_master role firewall defaults - remove etcd peer port, since we will not be supporting clustered embedded etcd - remove 8444 since console now runs on the api port by default - add 8444 and 7001 to disabled services to ensure removal if updating - Add new role os_env_extras_node that is a subset of the docker role - previously, we were starting/enabling docker which was causing issues with some installations - Does not install or start docker, since the openshift-node role will handle that for us - Only adds root to the dockerroot group - Update playbooks to use ops_env_extras_node role instead of docker role - os_firewall bug fixes - ignore ip6tables for now, since we are not configuring any ipv6 rules - if installing package do a daemon-reload before starting/enabling service - Add aws support to bin/cluster - Add list action to bin/cluster - Add update action to bin/cluster - cleanup some stray debug statements - some variable renaming for clarity
Diffstat (limited to 'inventory/gce')
-rw-r--r--inventory/gce/group_vars/all5
-rw-r--r--inventory/gce/group_vars/tag_host-type-master5
-rw-r--r--inventory/gce/group_vars/tag_host-type-node6
l---------inventory/gce/group_vars/tag_host-type-openshift-master1
l---------inventory/gce/group_vars/tag_host-type-openshift-node1
5 files changed, 0 insertions, 18 deletions
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