summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-24 09:05:08 -0400
committerGitHub <noreply@github.com>2016-08-24 09:05:08 -0400
commite395341212dea911a2fbc932102ca032057c5ff4 (patch)
tree9243afc55a95750eb74c458b3d759491c3a103b0 /playbooks/common
parented5ec6907fa805c4dfde714c8cdd7748d15f56ca (diff)
parent9b56859280093f859580320c46a575a654398da5 (diff)
downloadopenshift-e395341212dea911a2fbc932102ca032057c5ff4.tar.gz
openshift-e395341212dea911a2fbc932102ca032057c5ff4.tar.bz2
openshift-e395341212dea911a2fbc932102ca032057c5ff4.tar.xz
openshift-e395341212dea911a2fbc932102ca032057c5ff4.zip
Merge pull request #2351 from dgoodwin/plugin-order-override-2
Fix upgrade failure when master-config does not have pluginOrderOverride.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post.yml b/playbooks/common/openshift-cluster/upgrades/post.yml
index 796634a5e..e43954453 100644
--- a/playbooks/common/openshift-cluster/upgrades/post.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post.yml
@@ -66,6 +66,7 @@
grep pluginOrderOverride {{ openshift.common.config_base }}/master/master-config.yaml
register: grep_plugin_order_override
when: openshift.common.version_gte_3_3_or_1_3 | bool
+ failed_when: false
- name: Warn if pluginOrderOverride is in use in master-config.yaml
debug: msg="WARNING pluginOrderOverride is being deprecated in master-config.yaml, please see https://docs.openshift.com/enterprise/latest/architecture/additional_concepts/admission_controllers.html for more information."
when: not grep_plugin_order_override | skipped and grep_plugin_order_override.rc == 0