From 8762362a6575da639622f6b4ea02329c22e06246 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: May 31 2020 17:33:53 +0000 Subject: smooge missed phx2 openshift hard coding elsewhere --- diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index a6fe30d..26187ce 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -134,22 +134,30 @@ - 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 and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master01.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + - 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 and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master02.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + - 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 and hostvars[inventory_hostname].datacenter == 'phx2') or ( hostvars['os-master03.iad2.fedoraproject.org'].vmhost and hostvars[inventory_hostname].datacenter == 'iad2') + - name: Add back to openshift command: oc adm uncordon {{inventory_hostname}} delegate_to: "{{os_delegate_via}}{{env_suffix}}.phx2.fedoraproject.org" - when: inventory_hostname.startswith(('os-node', 'os-master')) + when: inventory_hostname.startswith(('os-node', 'os-master')) and hostvars[inventory_hostname].datacenter == 'phx2' + + - name: Add back to openshift + command: oc adm uncordon {{inventory_hostname}} + delegate_to: "{{os_delegate_via}}{{env_suffix}}.iad2.fedoraproject.org" + when: inventory_hostname.startswith(('os-node', 'os-master')) and hostvars[inventory_hostname].datacenter == 'iad2' - name: restart gssproxy if we rebooted a ipa server service: name=gssproxy state=restarted