summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-02-15 09:36:00 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-02-15 09:36:00 -0500
commitce306085ee0b8667dbba90e3a95199ce066c38d4 (patch)
treefe695d23828f4129303e48176b67cf93b83f85a8
parent9c342eebcb9b104bcb46f44447da8438f59c60cc (diff)
parent418373815ca71a856ac32ddc6505045aff77baf0 (diff)
downloadopenshift-ce306085ee0b8667dbba90e3a95199ce066c38d4.tar.gz
openshift-ce306085ee0b8667dbba90e3a95199ce066c38d4.tar.bz2
openshift-ce306085ee0b8667dbba90e3a95199ce066c38d4.tar.xz
openshift-ce306085ee0b8667dbba90e3a95199ce066c38d4.zip
Merge pull request #1369 from lhuard1A/gce_oo_option
Make the GCE image_name and the machine_type configurable from the CLI
-rw-r--r--playbooks/gce/openshift-cluster/vars.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index 1ae73fd68..d173213fc 100644
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ b/playbooks/gce/openshift-cluster/vars.yml
@@ -2,15 +2,15 @@
debug_level: 2
deployment_rhel7_ent_base:
- image: rhel-7
- machine_type: n1-standard-1
+ image: "{{ lookup('oo_option', 'image_name') | default('rhel-7', True) }}"
+ machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(ansible_ssh_user, true) }}"
sudo: yes
deployment_vars:
origin:
- image: centos-7
- machine_type: n1-standard-1
+ image: "{{ lookup('oo_option', 'image_name') | default('centos-7', True) }}"
+ machine_type: "{{ lookup('oo_option', 'machine_type') | default('n1-standard-1', True) }}"
ssh_user: "{{ lookup('env', 'gce_ssh_user') | default(ansible_ssh_user, true) }}"
sudo: yes
online: