summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-10-14 11:11:34 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-10-14 11:11:34 -0400
commitb9fb83e6855daca7ac03eb3ca6f826c64f60b264 (patch)
tree8154ec29cd5327e28530b195b71e6ea40fe8a193 /playbooks
parentf1b82648b06f393dfc960a4fc1f5bbe5b97b608a (diff)
parentccf9acd9dad5c9dc2e1640f417a9109c9042a689 (diff)
downloadopenshift-b9fb83e6855daca7ac03eb3ca6f826c64f60b264.tar.gz
openshift-b9fb83e6855daca7ac03eb3ca6f826c64f60b264.tar.bz2
openshift-b9fb83e6855daca7ac03eb3ca6f826c64f60b264.tar.xz
openshift-b9fb83e6855daca7ac03eb3ca6f826c64f60b264.zip
Merge pull request #688 from twiest/gce
Fixed GCE playbooks so that they're more like the AWS playbooks.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml15
-rw-r--r--playbooks/gce/openshift-cluster/config.yml1
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml31
-rw-r--r--playbooks/gce/openshift-cluster/tasks/launch_instances.yml21
4 files changed, 35 insertions, 33 deletions
diff --git a/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml b/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml
deleted file mode 100644
index 01d70a1a6..000000000
--- a/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- set_fact: k8s_type=infra
-- set_fact: sub_host_type="{{ type }}"
-- set_fact: number_infra="{{ count }}"
-
-- name: Generate infra instance names(s)
- set_fact:
- scratch_name: "{{ cluster_id }}-{{ k8s_type }}-{{ sub_host_type }}-{{ '%05x' | format(1048576 | random) }}"
- register: infra_names_output
- with_sequence: count={{ number_infra }}
-
-- set_fact:
- infra_names: "{{ infra_names_output.results | default([], true)
- | oo_collect('ansible_facts')
- | oo_collect('scratch_name') }}"
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml
index 7bd3f1a56..6ca4f7395 100644
--- a/playbooks/gce/openshift-cluster/config.yml
+++ b/playbooks/gce/openshift-cluster/config.yml
@@ -20,6 +20,7 @@
g_nodes_group: "{{ 'tag_env-host-type-' ~ cluster_id ~ '-openshift-node' }}"
g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"
g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"
+ g_nodeonmaster: true
openshift_cluster_id: "{{ cluster_id }}"
openshift_debug_level: 2
openshift_deployment_type: "{{ deployment_type }}"
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 94e57fe4e..c22b897d5 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -28,21 +28,22 @@
type: "{{ k8s_type }}"
g_sub_host_type: "{{ sub_host_type }}"
-# - include: ../../common/openshift-cluster/set_infra_launch_facts_tasks.yml
-# vars:
-# type: "infra"
-# count: "{{ num_infra }}"
-# - include: tasks/launch_instances.yml
-# vars:
-# instances: "{{ infra_names }}"
-# cluster: "{{ cluster_id }}"
-# type: "{{ k8s_type }}"
-# g_sub_host_type: "{{ sub_host_type }}"
-#
-# - set_fact:
-# a_infra: "{{ infra_names[0] }}"
-# - add_host: name={{ a_infra }} groups=service_master
-#
+ - include: ../../common/openshift-cluster/set_node_launch_facts_tasks.yml
+ vars:
+ type: "infra"
+ count: "{{ num_infra }}"
+ - include: tasks/launch_instances.yml
+ vars:
+ instances: "{{ node_names }}"
+ cluster: "{{ cluster_id }}"
+ type: "{{ k8s_type }}"
+ g_sub_host_type: "{{ sub_host_type }}"
+
+ - add_host:
+ name: "{{ master_names.0 }}"
+ groups: service_master
+ when: master_names is defined and master_names.0 is defined
+
- include: update.yml
#
#- name: Deploy OpenShift Services
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index e300b5b5a..c428cb465 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -20,22 +20,37 @@
- host-type-{{ type }}
- sub-host-type-{{ g_sub_host_type }}
- env-host-type-{{ cluster }}-openshift-{{ type }}
- when: instances |length > 0
+ when: instances |length > 0
register: gce
+- set_fact:
+ node_label:
+ # There doesn't seem to be a way to get the region directly, so parse it out of the zone.
+ region: "{{ gce.zone | regex_replace('^(.*)-.*$', '\\\\1') }}"
+ type: "{{ g_sub_host_type }}"
+ when: instances |length > 0 and type == "node"
+
+- set_fact:
+ node_label:
+ # There doesn't seem to be a way to get the region directly, so parse it out of the zone.
+ region: "{{ gce.zone | regex_replace('^(.*)-.*$', '\\\\1') }}"
+ type: "{{ type }}"
+ when: instances |length > 0 and type != "node"
+
- name: Add new instances to groups and set variables needed
add_host:
hostname: "{{ item.name }}"
- ansible_ssh_host: "{{ item.name }}"
+ ansible_ssh_host: "{{ item.public_ip }}"
ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}"
ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"
gce_public_ip: "{{ item.public_ip }}"
gce_private_ip: "{{ item.private_ip }}"
+ openshift_node_labels: "{{ node_label }}"
with_items: gce.instance_data | default([], true)
- name: Wait for ssh
- wait_for: port=22 host={{ item.name }}
+ wait_for: port=22 host={{ item.public_ip }}
with_items: gce.instance_data | default([], true)
- name: Wait for user setup