summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
committerJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
commit675f6165a83b86c1a498c327161f928d218ee244 (patch)
tree0ad271a03feac6bde2a296e6011498cd6455fa99 /playbooks/gce/openshift-cluster
parent59e69dd21c19bf745392b5e83bd652630ee870cc (diff)
parent8a4888ad30ce7c5898caac47614da2e13a759320 (diff)
downloadopenshift-675f6165a83b86c1a498c327161f928d218ee244.tar.gz
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.bz2
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.xz
openshift-675f6165a83b86c1a498c327161f928d218ee244.zip
Merge pull request #121 from detiber/nodeRegistrationChangesMaster
Node registration changes master
Diffstat (limited to 'playbooks/gce/openshift-cluster')
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml9
-rw-r--r--playbooks/gce/openshift-cluster/launch_instances.yml7
-rw-r--r--playbooks/gce/openshift-cluster/list.yml17
-rw-r--r--playbooks/gce/openshift-cluster/update.yml13
4 files changed, 40 insertions, 6 deletions
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 889d92d40..14cdd2537 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -11,7 +11,7 @@
- name: Generate master instance names(s)
set_fact: scratch={{ cluster_id }}-{{ k8s_type }}-{{ '%05x' |format( 1048576 |random) }}
register: master_names_output
- with_sequence: start=1 end={{ masters }}
+ with_sequence: start=1 end={{ num_masters }}
# These set_fact's cannot be combined
- set_fact:
@@ -25,14 +25,13 @@
instances: "{{ master_names }}"
cluster: "{{ cluster_id }}"
type: "{{ k8s_type }}"
- group_name: "tag_env-host-type-{{ cluster_id }}-openshift-master"
- set_fact: k8s_type="node"
- name: Generate node instance names(s)
set_fact: scratch={{ cluster_id }}-{{ k8s_type }}-{{ '%05x' |format( 1048576 |random) }}
register: node_names_output
- with_sequence: start=1 end={{ nodes }}
+ with_sequence: start=1 end={{ num_nodes }}
# These set_fact's cannot be combined
- set_fact:
@@ -55,9 +54,9 @@
- include: ../openshift-master/config.yml
vars:
oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-master\"]"
- oo_env: "{{ cluster_id }}"
- include: ../openshift-node/config.yml
vars:
oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-node\"]"
- oo_env: "{{ cluster_id }}"
+
+- include: list.yml
diff --git a/playbooks/gce/openshift-cluster/launch_instances.yml b/playbooks/gce/openshift-cluster/launch_instances.yml
index 20e31d990..b4f33bd87 100644
--- a/playbooks/gce/openshift-cluster/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/launch_instances.yml
@@ -1,3 +1,7 @@
+---
+# TODO: when we are ready to go to ansible 1.9+ support only, we can update to
+# the gce task to use the disk_auto_delete parameter to avoid having to delete
+# the disk as a separate step on termination
- set_fact:
machine_type: "{{ lookup('env', 'gce_machine_type') |default('n1-standard-1', true) }}"
@@ -18,12 +22,13 @@
- "env-host-type-{{ cluster }}-openshift-{{ type }}"
register: gce
-- name: Add new instances public IPs
+- name: Add new instances to groups and set variables needed
add_host:
hostname: "{{ item.name }}"
ansible_ssh_host: "{{ item.public_ip }}"
groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"
gce_public_ip: "{{ item.public_ip }}"
+ gce_private_ip: "{{ item.private_ip }}"
with_items: gce.instance_data
- name: Wait for ssh
diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml
new file mode 100644
index 000000000..1124b0ea3
--- /dev/null
+++ b/playbooks/gce/openshift-cluster/list.yml
@@ -0,0 +1,17 @@
+---
+- name: Generate oo_list_hosts group
+ hosts: localhost
+ gather_facts: no
+ tasks:
+ - set_fact: scratch_group=tag_env-{{ cluster_id }}
+ when: cluster_id != ''
+ - set_fact: scratch_group=all
+ when: scratch_group is not defined
+ - add_host: name={{ item }} groups=oo_list_hosts
+ with_items: groups[scratch_group] | difference(['localhost']) | difference(groups.status_terminated)
+
+- name: List Hosts
+ hosts: oo_list_hosts
+ gather_facts: no
+ tasks:
+ - debug: msg="public:{{hostvars[inventory_hostname].gce_public_ip}} private:{{hostvars[inventory_hostname].gce_private_ip}}"
diff --git a/playbooks/gce/openshift-cluster/update.yml b/playbooks/gce/openshift-cluster/update.yml
new file mode 100644
index 000000000..973e4c3ef
--- /dev/null
+++ b/playbooks/gce/openshift-cluster/update.yml
@@ -0,0 +1,13 @@
+---
+- hosts: "tag_env-{{ cluster_id }}"
+ roles:
+ - openshift_repos
+ - os_update_latest
+
+- include: ../openshift-master/config.yml
+ vars:
+ oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-master\"]"
+
+- include: ../openshift-node/config.yml
+ vars:
+ oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-node\"]"