diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-16 16:56:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 16:56:46 -0500 |
| commit | 085ab3c75d831482a3a54ee7a0a51298669913c0 (patch) | |
| tree | 119fb470d97ba752a7c06e15eabcb63f079330bd /playbooks | |
| parent | 43330fbd7cb90491d63e54430394a309f7a41f73 (diff) | |
| parent | b38a5540bb89b2aecb8004750d6b423d73cf6f07 (diff) | |
| download | openshift-085ab3c75d831482a3a54ee7a0a51298669913c0.tar.gz openshift-085ab3c75d831482a3a54ee7a0a51298669913c0.tar.bz2 openshift-085ab3c75d831482a3a54ee7a0a51298669913c0.tar.xz openshift-085ab3c75d831482a3a54ee7a0a51298669913c0.zip | |
Merge pull request #3370 from adbaldi/work
Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging)
Diffstat (limited to 'playbooks')
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 5d3280328..4ee6afe2a 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -43,7 +43,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --force --delete-local-data + {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --force --delete-local-data --ignore-daemonsets delegate_to: "{{ groups.oo_first_master.0 }}" when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_upgrade diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index a4aefcdac..fd01a6625 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -257,7 +257,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data + {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data --ignore-daemonsets delegate_to: "{{ groups.oo_first_master.0 }}" roles: diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index e3a98fd9b..4e1838c71 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -26,7 +26,7 @@ - name: Drain Node for Kubelet upgrade command: > - {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data + {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data --ignore-daemonsets delegate_to: "{{ groups.oo_first_master.0 }}" roles: |