From 45e9dbcadea30e666cca3e6991825fb62fd0ddd1 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 27 Feb 2019 22:55:18 +0100 Subject: [PATCH] Also do draining for os-master nodes Signed-off-by: Patrick Uiterwijk --- playbooks/vhost_reboot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 3e49295bdc..98477367f4 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -47,7 +47,7 @@ - name: drain OS node if necessary command: oc adm drain {{inventory_hostname }} --ignore-daemonsets --delete-local-data delegate_to: os-master01{{env_suffix}}.phx2.fedoraproject.org - when: inventory_hostname.startswith('os-node') + when: inventory_hostname.startswith(('os-node', 'os-master')) - name: schedule regular host downtime nagios: action=downtime minutes=30 service=host host={{ inventory_hostname_short }}{{ env_suffix }} @@ -117,7 +117,7 @@ - name: Add back to openshift command: oc adm uncordon {{inventory_hostname}} delegate_to: os-master01{{env_suffix}}.phx2.fedoraproject.org - when: inventory_hostname.startswith('os-node') + when: inventory_hostname.startswith(('os-node', 'os-master')) # Call out to that dns playbook. Put proxies back in now that they're back - import_playbook: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies