diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-06 16:52:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 16:52:47 -0400 |
| commit | f734724fbcac6bdd2e9bb9f69058385768ef0cd0 (patch) | |
| tree | 2b410928549eaa43c4323adc703a44bdaf5a962e /playbooks/common/openshift-cluster/upgrades | |
| parent | 67da7e2e4699f9a226a436218723749ebc14ace1 (diff) | |
| parent | 2d8e3d2b28ce19569c76c56102e9639a6f26b0c2 (diff) | |
| download | openshift-f734724fbcac6bdd2e9bb9f69058385768ef0cd0.tar.gz openshift-f734724fbcac6bdd2e9bb9f69058385768ef0cd0.tar.bz2 openshift-f734724fbcac6bdd2e9bb9f69058385768ef0cd0.tar.xz openshift-f734724fbcac6bdd2e9bb9f69058385768ef0cd0.zip | |
Merge pull request #4252 from sdodson/tolerate-node-upgrade-failure
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 2 |
2 files changed, 3 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 e10c4c540..b980909eb 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -247,8 +247,8 @@ hosts: oo_masters_to_config:&oo_nodes_to_upgrade # This var must be set with -e on invocation, as it is not a per-host inventory var # and is evaluated early. Values such as "20%" can also be used. - serial: "{{ openshift_upgrade_nodes_serial | default(1) }}" - any_errors_fatal: true + serial: "{{ openshift_upgrade_control_plane_nodes_serial | default(1) }}" + max_fail_percentage: "{{ openshift_upgrade_control_plane_nodes_max_fail_percentage | default(0) }}" pre_tasks: - name: Load lib_openshift modules diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index 4d455fe0a..91dbc2cd4 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -4,7 +4,7 @@ # This var must be set with -e on invocation, as it is not a per-host inventory var # and is evaluated early. Values such as "20%" can also be used. serial: "{{ openshift_upgrade_nodes_serial | default(1) }}" - any_errors_fatal: true + max_fail_percentage: "{{ openshift_upgrade_nodes_max_fail_percentage | default(0) }}" pre_tasks: - name: Load lib_openshift modules |