openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Update to OpenShift 3.11 release" into stable/rocky

This commit is contained in:
Zuul 2018-11-14 17:42:20 +00:00 committed by Gerrit Code Review
parent e0c0acc252 7eb2024432
commit 96bb135a46
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extraconfig/services/openshift-master.yaml
View File

@ -56,7 +56,7 @@ parameters:
description: Path to OpenShift-Ansible node scale-up playbook.
type: string
OpenShiftUpgradePlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade.yml'
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade.yml'
description: Path to OpenShift-Ansible Upgrade playbook.
type: string
OpenShiftGlobalVariables:
@ -82,8 +82,8 @@ parameters:
DockerOpenShiftAnsibleImage:
description: Openshift-ansible container image.
type: string
DockerOpenShiftBaseImage:
description: Base container image for openshift.
DockerOpenShiftControlPlaneImage:
description: Control Plane container image for openshift.
type: string
DockerOpenShiftCockpitImage:
description: Cockpit container image for openshift
@ -160,14 +160,14 @@ outputs:
set_fact:
openshift_global_vars:
map_merge:
- openshift_release: '3.10'
openshift_version: '3.10'
- openshift_release: '3.11'
openshift_version: '3.11'
openshift_image_tag:
yaql:
expression:
$.data.image.rightSplit(":", 1)[1]
data:
image: {get_param: DockerOpenShiftBaseImage}
image: {get_param: DockerOpenShiftControlPlaneImage}
openshift_enable_excluders: false
openshift_deployment_type: "{{tripleo_openshift_deployment_type}}"
openshift_use_dnsmasq: true
@ -185,16 +185,15 @@ outputs:
oreg_url:
yaql:
expression:
$.data.image.rightSplit(":", 1).join("-${component}:")
$.data.image.replace("-control-plane:", "-${component}:")
data:
image: {get_param: DockerOpenShiftBaseImage}
image: {get_param: DockerOpenShiftControlPlaneImage}
etcd_image: {get_param: DockerOpenShiftEtcdImage}
osm_etcd_image: {get_param: DockerOpenShiftEtcdImage}
osm_image: {get_param: DockerOpenShiftBaseImage}
osm_image: {get_param: DockerOpenShiftControlPlaneImage}
osn_image: {get_param: DockerOpenShiftNodeImage}
openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
openshift_docker_insecure_registries: {get_param: DockerInsecureRegistryAddress}
openshift_docker_additional_registries: {get_param: DockerInsecureRegistryAddress}
openshift_master_bootstrap_auto_approve: true
osm_controller_args: {"experimental-cluster-signing-duration": ["20m"]}
- {get_param: OpenShiftGlobalVariables}