summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-master
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/gce/openshift-master')
-rw-r--r--playbooks/gce/openshift-master/config.yml6
-rw-r--r--playbooks/gce/openshift-master/launch.yml12
-rw-r--r--playbooks/gce/openshift-master/terminate.yml16
-rw-r--r--playbooks/gce/openshift-master/vars.yml1
4 files changed, 18 insertions, 17 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index e405e2fb4..857da0763 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
@@ -1,3 +1,4 @@
+---
- name: master/config.yml, populate oo_masters_to_config host group if needed
hosts: localhost
gather_facts: no
@@ -7,11 +8,10 @@
with_items: "{{ oo_host_group_exp | default('') }}"
when: oo_host_group_exp is defined
-- name: Gather facts for nodes in {{ oo_env }}
- hosts: "tag_env-host-type-{{ oo_env }}-openshift-node"
-
- name: "Configure instances"
hosts: oo_masters_to_config
+ vars:
+ openshift_hostname: "{{ gce_private_ip }}"
vars_files:
- vars.yml
roles:
diff --git a/playbooks/gce/openshift-master/launch.yml b/playbooks/gce/openshift-master/launch.yml
index 3512274cc..287596002 100644
--- a/playbooks/gce/openshift-master/launch.yml
+++ b/playbooks/gce/openshift-master/launch.yml
@@ -1,4 +1,8 @@
---
+# 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
+
- name: Launch instance(s)
hosts: localhost
connection: local
@@ -25,15 +29,17 @@
register: gce
- name: Add new instances public IPs to oo_masters_to_config
- add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_masters_to_config"
+ add_host:
+ hostname: "{{ item.name }}"
+ ansible_ssh_host: "{{ item.public_ip }}"
+ groupname: oo_masters_to_config
+ gce_private_ip: "{{ item.private_ip }}"
with_items: gce.instance_data
- name: Wait for ssh
wait_for: "port=22 host={{ item.public_ip }}"
with_items: gce.instance_data
- - debug: var=gce
-
- name: Wait for root user setup
command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null root@{{ item.public_ip }} echo root user is setup"
register: result
diff --git a/playbooks/gce/openshift-master/terminate.yml b/playbooks/gce/openshift-master/terminate.yml
index 9e027cf41..8319774f8 100644
--- a/playbooks/gce/openshift-master/terminate.yml
+++ b/playbooks/gce/openshift-master/terminate.yml
@@ -1,17 +1,13 @@
-- name: "populate oo_hosts_to_terminate host group if needed"
+---
+- name: Populate oo_masters_to_terminate host group if needed
hosts: localhost
gather_facts: no
tasks:
- - debug: var=oo_host_group_exp
-
- name: Evaluate oo_host_group_exp if it's set
- add_host: "name={{ item }} groups=oo_hosts_to_terminate"
+ add_host: "name={{ item }} groups=oo_masters_to_terminate"
with_items: "{{ oo_host_group_exp | default('') }}"
when: oo_host_group_exp is defined
- - debug: msg="{{ groups['oo_hosts_to_terminate'] }}"
-
-
- name: Terminate master instances
hosts: localhost
connection: local
@@ -23,12 +19,10 @@
pem_file: "{{ gce_pem_file }}"
project_id: "{{ gce_project_id }}"
state: 'absent'
- instance_names: "{{ groups['oo_hosts_to_terminate'] }}"
- disks: "{{ groups['oo_hosts_to_terminate'] }}"
+ instance_names: "{{ groups['oo_masters_to_terminate'] }}"
+ disks: "{{ groups['oo_masters_to_terminate'] }}"
register: gce
- - debug: var=gce
-
- name: Remove disks of instances
gce_pd:
service_account_email: "{{ gce_service_account_email }}"
diff --git a/playbooks/gce/openshift-master/vars.yml b/playbooks/gce/openshift-master/vars.yml
index fb5f4ea42..c196b2fca 100644
--- a/playbooks/gce/openshift-master/vars.yml
+++ b/playbooks/gce/openshift-master/vars.yml
@@ -1,2 +1,3 @@
---
openshift_debug_level: 4
+openshift_cluster_id: "{{ cluster_id }}"