diff options
| author | Wesley Hearn <whearn@redhat.com> | 2015-07-20 16:20:12 -0400 |
|---|---|---|
| committer | Wesley Hearn <whearn@redhat.com> | 2015-07-23 11:30:48 -0400 |
| commit | c4cca1d7184ae859706b5854a04f18095c12f1d6 (patch) | |
| tree | d0637086194fcc303226ff7d3f98684c8d427a44 /playbooks/gce/openshift-cluster | |
| parent | 0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6 (diff) | |
| download | openshift-c4cca1d7184ae859706b5854a04f18095c12f1d6.tar.gz openshift-c4cca1d7184ae859706b5854a04f18095c12f1d6.tar.bz2 openshift-c4cca1d7184ae859706b5854a04f18095c12f1d6.tar.xz openshift-c4cca1d7184ae859706b5854a04f18095c12f1d6.zip | |
Infra node support
Diffstat (limited to 'playbooks/gce/openshift-cluster')
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch.yml | 20 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/tasks/launch_instances.yml | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml index 35737f03d..7a3b80da0 100644 --- a/playbooks/gce/openshift-cluster/launch.yml +++ b/playbooks/gce/openshift-cluster/launch.yml @@ -15,17 +15,33 @@ instances: "{{ master_names }}" cluster: "{{ cluster_id }}" type: "{{ k8s_type }}" + g_sub_host_type: "default" - include: ../../common/openshift-cluster/set_node_launch_facts_tasks.yml + vars: + type: "compute" + count: "{{ num_nodes }}" - include: tasks/launch_instances.yml vars: instances: "{{ node_names }}" cluster: "{{ cluster_id }}" type: "{{ k8s_type }}" + g_sub_host_type: "{{ sub_host_type }}" + + - include: ../../common/openshift-cluster/set_node_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_master: "{{ master_names[0] }}" - - add_host: name={{ a_master }} groups=service_master + a_infra: "{{ infra_names[0] }}" + - add_host: name={{ a_infra }} groups=service_master - include: update.yml diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml index 9a9848f05..6307ecc27 100644 --- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml @@ -14,6 +14,7 @@ - created-by-{{ lookup('env', 'LOGNAME') |default(cluster, true) }} - env-{{ cluster }} - host-type-{{ type }} + - sub-host-type-{{ sub_host_type }} - env-host-type-{{ cluster }}-openshift-{{ type }} register: gce |