From 5dad27ba55209aba8983ab746e5eebb8851e7b7d Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Tue, 14 Nov 2017 16:17:35 -0500 Subject: Allow disabling authorization migration check --- playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades/v3_7') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml index 7a28eeb27..74d0cd8ad 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml @@ -11,13 +11,15 @@ tasks: - name: Check for invalid namespaces and SDN errors oc_objectvalidator: - + # DO NOT DISABLE THIS, YOUR UPGRADE WILL FAIL IF YOU DO SO - name: Confirm OpenShift authorization objects are in sync command: > {{ openshift.common.client_binary }} adm migrate authorization - when: openshift_currently_installed_version | version_compare('3.7','<') + when: + - openshift_currently_installed_version | version_compare('3.7','<') + - openshift_upgrade_pre_authorization_migration_enabled | default(true) | bool changed_when: false register: l_oc_result until: l_oc_result.rc == 0 - retries: 4 + retries: 2 delay: 15 -- cgit v1.2.3