diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-11-14 17:48:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 17:48:14 -0500 |
commit | de23ba47105d39c5df44d5ff69244dfc54bb6800 (patch) | |
tree | 515e8a88a66c3273b28de880ae4db6a6b78b6cc7 /playbooks/common/openshift-cluster/upgrades/v3_7 | |
parent | 7e6dc1daefa38003acfb0d9180da23e0330e8fde (diff) | |
parent | 5dad27ba55209aba8983ab746e5eebb8851e7b7d (diff) | |
download | openshift-de23ba47105d39c5df44d5ff69244dfc54bb6800.tar.gz openshift-de23ba47105d39c5df44d5ff69244dfc54bb6800.tar.bz2 openshift-de23ba47105d39c5df44d5ff69244dfc54bb6800.tar.xz openshift-de23ba47105d39c5df44d5ff69244dfc54bb6800.zip |
Merge pull request #6115 from sdodson/disable-auth-migration
Allow disabling authorization migration check
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_7')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml | 8 |
1 files changed, 5 insertions, 3 deletions
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 |