summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 20:29:10 -0800
committerGitHub <noreply@github.com>2018-02-12 20:29:10 -0800
commite4111f2acca12db04a6ef3241acc4250e488719b (patch)
treef7a314a4566f80371d940da86d211d548747feeb /playbooks/common/openshift-cluster
parentb86082b1c5cdd78c85e33ec51e5dab71f36aad0d (diff)
parent7d052a5f90f96f7c9ca78889221cda79614446c9 (diff)
downloadopenshift-e4111f2acca12db04a6ef3241acc4250e488719b.tar.gz
openshift-e4111f2acca12db04a6ef3241acc4250e488719b.tar.bz2
openshift-e4111f2acca12db04a6ef3241acc4250e488719b.tar.xz
openshift-e4111f2acca12db04a6ef3241acc4250e488719b.zip
Merge pull request #7095 from jpeeler/upgrade-cat
Automatic merge from submit-queue. Add service catalog to be upgraded Currently service catalog was left running at the previous version. https://bugzilla.redhat.com/show_bug.cgi?id=1541247
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml7
1 files changed, 7 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 86cde2844..edc5aa9c5 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -165,3 +165,10 @@
msg: "WARNING the shared-resource-viewer role could not be upgraded to 3.6 spec because it's marked protected, please see https://bugzilla.redhat.com/show_bug.cgi?id=1493213"
when:
- __shared_resource_viewer_protected | default(false)
+
+- name: Upgrade Service Catalog
+ hosts: oo_first_master
+ roles:
+ - role: openshift_service_catalog
+ when:
+ - openshift_enable_service_catalog | default(true) | bool