summaryrefslogtreecommitdiffstats
path: root/playbooks/gce
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2016-02-10 14:11:07 +0100
committerLénaïc Huard <lhuard@amadeus.com>2016-02-10 14:11:07 +0100
commit418373815ca71a856ac32ddc6505045aff77baf0 (patch)
tree57aa3924a118e3c720142d666fd882c2bd1d7d51 /playbooks/gce
parentd148f0a39665d7528b854515257aa45ec6739230 (diff)
downloadopenshift-418373815ca71a856ac32ddc6505045aff77baf0.tar.gz
openshift-418373815ca71a856ac32ddc6505045aff77baf0.tar.bz2
openshift-418373815ca71a856ac32ddc6505045aff77baf0.tar.xz
openshift-418373815ca71a856ac32ddc6505045aff77baf0.zip
Make the GCE image_name and the machine_type configurable from the CLI
Diffstat (limited to 'playbooks/gce')
-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: