summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack/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/openstack/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/openstack/openshift-cluster')
-rw-r--r--playbooks/openstack/openshift-cluster/vars.yml12
1 files changed, 8 insertions, 4 deletions
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml
index f8d15999e..76cde1706 100644
--- a/playbooks/openstack/openshift-cluster/vars.yml
+++ b/playbooks/openstack/openshift-cluster/vars.yml
@@ -20,6 +20,11 @@ openstack_flavor:
infra: "{{ lookup('oo_option', 'infra_flavor' ) | default('m1.small', True) }}"
node: "{{ lookup('oo_option', 'node_flavor' ) | default('m1.medium', True) }}"
+deployment_rhel7_ent_base:
+ image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.2-20151102.0.x86_64', True) }}"
+ ssh_user: openshift
+ sudo: yes
+
deployment_vars:
origin:
image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}"
@@ -29,7 +34,6 @@ deployment_vars:
image:
ssh_user: root
sudo: no
- enterprise:
- image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.1-20150224.0.x86_64', True) }}"
- ssh_user: openshift
- sudo: yes
+ enterprise: "{{ deployment_rhel7_ent_base }}"
+ openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
+ atomic-enterprise: "{{ deployment_rhel7_ent_base }}"