diff options
| author | Lénaïc Huard <lhuard@amadeus.com> | 2016-01-07 15:09:46 +0100 | 
|---|---|---|
| committer | Lénaïc Huard <lhuard@amadeus.com> | 2016-01-08 18:17:51 +0100 | 
| commit | 0c056112112886e0d5683a10eec3368695c96e88 (patch) | |
| tree | 2207b1f1654cfff2f0b8e1fe5ac7efd8bd263bc5 /playbooks/openstack | |
| parent | b733e7fb2c79c6b7423c159681eba28417cdf599 (diff) | |
| download | openshift-0c056112112886e0d5683a10eec3368695c96e88.tar.gz openshift-0c056112112886e0d5683a10eec3368695c96e88.tar.bz2 openshift-0c056112112886e0d5683a10eec3368695c96e88.tar.xz openshift-0c056112112886e0d5683a10eec3368695c96e88.zip | |
Make bin/cluster able to spawn OSE 3.1 clusters
Diffstat (limited to 'playbooks/openstack')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 12 | 
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 }}" | 
