diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-13 13:25:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 13:25:17 -0500 |
| commit | adb878d10240f9786520ce48b4710ac5b7da7dcd (patch) | |
| tree | de15886ee0a38ea1a1ae3b888ccdca9b11035ff8 /playbooks/common | |
| parent | 7eae68537d03c6c1ad849d6226e15631652b9c65 (diff) | |
| parent | 964fa7f759608deaa6d6ca008ada19a849d6b7fd (diff) | |
| download | openshift-adb878d10240f9786520ce48b4710ac5b7da7dcd.tar.gz openshift-adb878d10240f9786520ce48b4710ac5b7da7dcd.tar.bz2 openshift-adb878d10240f9786520ce48b4710ac5b7da7dcd.tar.xz openshift-adb878d10240f9786520ce48b4710ac5b7da7dcd.zip | |
Merge pull request #4155 from ewolinetz/registry_console_upgrade
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index fff199f42..8a60ef236 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -9,6 +9,8 @@ replace ( '${version}', openshift_image_tag ) }}" router_image: "{{ openshift.master.registry_url | replace( '${component}', 'haproxy-router' ) | replace ( '${version}', openshift_image_tag ) }}" + registry_console_image: "{{ openshift.master.registry_url | replace ( '${component}', 'registry-console') | + replace ( '${version}', openshift.common.short_version ) }}" pre_tasks: - name: Load lib_openshift modules @@ -61,6 +63,26 @@ when: - _default_registry.results.results[0] != {} + - name: Check for registry-console + oc_obj: + state: list + kind: dc + name: registry-console + register: _registry_console + when: + - openshift.common.deployment_type != 'origin' + + - name: Update registry-console image to current version + oc_edit: + kind: dc + name: registry-console + namespace: default + content: + spec.template.spec.containers[0].image: "{{ registry_console_image }}" + when: + - openshift.common.deployment_type != 'origin' + - _registry_console.results.results[0] != {} + roles: - openshift_manageiq # Create the new templates shipped in 3.2, existing templates are left |