From 7aedb805bba9f30c6f07a8dc5d3581f3f647c9fe Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 15 Jan 2020 21:53:42 +0000 Subject: [PATCH] Revert "[vhost_reboot] Try to get the os code to work" This reverts commit 899a127f7ae1ffbbe935d45f640b9ac50e8d499c. --- playbooks/vhost_reboot.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index b4d065c23c..79d55289be 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -47,17 +47,17 @@ - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master01 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master01.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master01.phx2.fedoraproject.org'].vmhost - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master02 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master02.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master02.phx2.fedoraproject.org'].vmhost - name: figure out which node to delegate os cordon to set_fact: os_delegate_via: os-master03 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master03.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master03.phx2.fedoraproject.org'].vmhost - name: drain OS node if necessary command: oc adm drain {{inventory_hostname }} --ignore-daemonsets --delete-local-data @@ -129,17 +129,17 @@ - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master01 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master01.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master01.phx2.fedoraproject.org'].vmhost - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master02 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master02.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master02.phx2.fedoraproject.org'].vmhost - name: figure out which node to delegate os uncordon to set_fact: os_delegate_via: os-master03 - when: hostvars[inventory_hostname]['vmhost'] != hostvars['os-master03.phx2.fedoraproject.org']['vmhost'] + when: hostvars[inventory_hostname].vmhost != hostvars['os-master03.phx2.fedoraproject.org'].vmhost - name: Add back to openshift command: oc adm uncordon {{inventory_hostname}}