diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-14 11:11:34 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-10-14 11:11:34 -0400 |
| commit | b9fb83e6855daca7ac03eb3ca6f826c64f60b264 (patch) | |
| tree | 8154ec29cd5327e28530b195b71e6ea40fe8a193 /playbooks/gce/openshift-cluster/launch.yml | |
| parent | f1b82648b06f393dfc960a4fc1f5bbe5b97b608a (diff) | |
| parent | ccf9acd9dad5c9dc2e1640f417a9109c9042a689 (diff) | |
| download | openshift-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/gce/openshift-cluster/launch.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch.yml | 31 |
1 files changed, 16 insertions, 15 deletions
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 |