summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/launch.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-11-19 10:36:44 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-11-19 10:36:44 -0500
commit248decb5a36906160ed820602ac2227b44023afb (patch)
tree8d22e45d51d2d4c5ae45ed29bc38be5dd37c3c5c /playbooks/gce/openshift-cluster/launch.yml
parent6ee1a17c508327bb30b4a6563859358cc13786ef (diff)
parentf5c376f6643b5791dabd197f368436d30fa8e4bc (diff)
downloadopenshift-248decb5a36906160ed820602ac2227b44023afb.tar.gz
openshift-248decb5a36906160ed820602ac2227b44023afb.tar.bz2
openshift-248decb5a36906160ed820602ac2227b44023afb.tar.xz
openshift-248decb5a36906160ed820602ac2227b44023afb.zip
Merge pull request #937 from rdossin1A/machine_types
Differentiate machine types on GCE (master and nodes)
Diffstat (limited to 'playbooks/gce/openshift-cluster/launch.yml')
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml4
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: