diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-03 22:13:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 22:13:54 -0800 |
| commit | 7cc3308e7b2461936597c3ac8f6877fb23a39856 (patch) | |
| tree | 54a820bbb33860102dce5163fbe4a1e9bf770b0f /playbooks/common/openshift-cluster | |
| parent | 9e0e2a6c4fe14373ba51aa08b0e87f1492559394 (diff) | |
| parent | 553e06d7baba5bfc96d8b00684a3d8e6db11f4b1 (diff) | |
| download | openshift-7cc3308e7b2461936597c3ac8f6877fb23a39856.tar.gz openshift-7cc3308e7b2461936597c3ac8f6877fb23a39856.tar.bz2 openshift-7cc3308e7b2461936597c3ac8f6877fb23a39856.tar.xz openshift-7cc3308e7b2461936597c3ac8f6877fb23a39856.zip | |
Merge pull request #5694 from nak3/remove-unnecessary-failed_when
Automatic merge from submit-queue.
remove openshift_upgrade_{pre,post}_storage_migration_enabled from failed_when
When `openshift_upgrade_{pre,post}_storage_migration_enabled` was
enabled, `oadm migrate storage` was called. After that, failed_when is
evaluated, so `openshift_upgrade_{pre,post}_storage_migration_enabled`
is always true and not necessary in the failed_when list. This patch
remove them from failed_when list.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 1dcd9a207..9b5ba3482 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -56,7 +56,6 @@ register: l_pb_upgrade_control_plane_pre_upgrade_storage when: openshift_upgrade_pre_storage_migration_enabled | default(true) | bool failed_when: - - openshift_upgrade_pre_storage_migration_enabled | default(true) | bool - l_pb_upgrade_control_plane_pre_upgrade_storage.rc != 0 - openshift_upgrade_pre_storage_migration_fatal | default(true) | bool @@ -122,7 +121,6 @@ - openshift_upgrade_post_storage_migration_enabled | default(true) | bool - openshift_version is version_compare('3.7','<') failed_when: - - openshift_upgrade_post_storage_migration_enabled | default(true) | bool - l_pb_upgrade_control_plane_post_upgrade_storage.rc != 0 - openshift_upgrade_post_storage_migration_fatal | default(false) | bool run_once: true @@ -258,7 +256,6 @@ register: l_pb_upgrade_control_plane_post_upgrade_storage when: openshift_upgrade_post_storage_migration_enabled | default(true) | bool failed_when: - - openshift_upgrade_post_storage_migration_enabled | default(true) | bool - l_pb_upgrade_control_plane_post_upgrade_storage.rc != 0 - openshift_upgrade_post_storage_migration_fatal | default(false) | bool |