summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-01-11 10:16:09 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-01-11 10:16:09 -0500
commit0e60de158e27b6f15adc943db703fec4bd2c72bc (patch)
tree282251a948f1fe14d7af4366e0d32fda27c4670e /playbooks/gce/openshift-cluster
parentc64ca552a15885b5811e535f81678a1dc80c0087 (diff)
parent0c056112112886e0d5683a10eec3368695c96e88 (diff)
downloadopenshift-0e60de158e27b6f15adc943db703fec4bd2c72bc.tar.gz
openshift-0e60de158e27b6f15adc943db703fec4bd2c72bc.tar.bz2
openshift-0e60de158e27b6f15adc943db703fec4bd2c72bc.tar.xz
openshift-0e60de158e27b6f15adc943db703fec4bd2c72bc.zip
Merge pull request #1128 from lhuard1A/bin_cluster_ose_3.1
Make bin/cluster able to spawn an OSE 3.1 cluster
Diffstat (limited to 'playbooks/gce/openshift-cluster')
-rw-r--r--playbooks/gce/openshift-cluster/vars.yml15
1 files changed, 10 insertions, 5 deletions
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index bdb39923e..7fb13c7a6 100644
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ b/playbooks/gce/openshift-cluster/vars.yml
@@ -3,6 +3,13 @@ do_we_use_openshift_sdn: true
sdn_network_plugin: redhat/openshift-ovs-subnet
debug_level: 2
# os_sdn_network_plugin_name can be ovssubnet or multitenant, see https://docs.openshift.org/latest/architecture/additional_concepts/sdn.html#ovssubnet-plugin-operation
+
+deployment_rhel7_ent_base:
+ image: rhel-7
+ machine_type: n1-standard-1
+ ssh_user:
+ sudo: yes
+
deployment_vars:
origin:
image: preinstalled-slave-50g-v5
@@ -14,8 +21,6 @@ deployment_vars:
machine_type: n1-standard-1
ssh_user: root
sudo: no
- enterprise:
- image: rhel-7
- machine_type: n1-standard-1
- ssh_user:
- sudo: yes
+ enterprise: "{{ deployment_rhel7_ent_base }}"
+ openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
+ atomic-enterprise: "{{ deployment_rhel7_ent_base }}"