diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-22 14:51:50 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-05-22 14:51:50 -0400 |
| commit | 2d8e3d2b28ce19569c76c56102e9639a6f26b0c2 (patch) | |
| tree | 87ac67a959e3f2559d5bf8f8935c4af334790f3e | |
| parent | 1a868e61fbab8f1e2095c0952031656c47926220 (diff) | |
| download | openshift-2d8e3d2b28ce19569c76c56102e9639a6f26b0c2.tar.gz openshift-2d8e3d2b28ce19569c76c56102e9639a6f26b0c2.tar.bz2 openshift-2d8e3d2b28ce19569c76c56102e9639a6f26b0c2.tar.xz openshift-2d8e3d2b28ce19569c76c56102e9639a6f26b0c2.zip | |
Add separate variables for control plane nodes
| -rw-r--r-- | inventory/byo/hosts.origin.example | 6 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 310b8ab44..023930954 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -791,9 +791,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Upgrade Control # # By default nodes are upgraded in a serial manner one at a time and all failures -# are fatal +# are fatal, one set of variables for normal nodes, one set of variables for +# nodes that are part of control plane as the number of hosts may be different +# in those two groups. #openshift_upgrade_nodes_serial=1 #openshift_upgrade_nodes_max_fail_percentage=0 +#openshift_upgrade_control_plane_nodes_serial=1 +#openshift_upgrade_control_plane_nodes_max_fail_percentage=0 # # You can specify the number of nodes to upgrade at once. We do not currently # attempt to verify that you have capacity to drain this many nodes at once diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index e126bbcab..407ef19fb 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -788,9 +788,13 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Upgrade Control # # By default nodes are upgraded in a serial manner one at a time and all failures -# are fatal +# are fatal, one set of variables for normal nodes, one set of variables for +# nodes that are part of control plane as the number of hosts may be different +# in those two groups. #openshift_upgrade_nodes_serial=1 #openshift_upgrade_nodes_max_fail_percentage=0 +#openshift_upgrade_control_plane_nodes_serial=1 +#openshift_upgrade_control_plane_nodes_max_fail_percentage=0 # # You can specify the number of nodes to upgrade at once. We do not currently # attempt to verify that you have capacity to drain this many nodes at once diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index a335c1072..275596582 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) }}" - max_fail_percentage: "{{ openshift_upgrade_nodes_max_fail_percentage | default(0) }}" + 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 |