diff options
| author | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
| commit | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /playbooks/gce/openshift-cluster/launch.yml | |
| parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
| parent | b7b3e6dbdfd17e55055630ce963965818e830620 (diff) | |
| download | openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.gz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.bz2 openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.xz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.zip | |
Merge remote-tracking branch 'upstream/master' into prod
Diffstat (limited to 'playbooks/gce/openshift-cluster/launch.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml index 8be5d53e7..d6ef57c45 100644 --- a/playbooks/gce/openshift-cluster/launch.yml +++ b/playbooks/gce/openshift-cluster/launch.yml @@ -16,6 +16,8 @@ cluster: "{{ cluster_id }}" type: "{{ k8s_type }}" g_sub_host_type: "default" + gce_machine_type: "{{ lookup('env', 'gce_machine_master_type') | default(lookup('env', 'gce_machine_type'), true) }}" + gce_machine_image: "{{ lookup('env', 'gce_machine_master_image') | default(lookup('env', 'gce_machine_image'), true) }}" - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml vars: @@ -27,6 +29,8 @@ cluster: "{{ cluster_id }}" type: "{{ k8s_type }}" g_sub_host_type: "{{ sub_host_type }}" + gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}" + gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}" - include: ../../common/openshift-cluster/tasks/set_node_launch_facts.yml vars: |