X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fdecomission.mdwn;h=07aec800fbf24a92540806b98bc6fa988fccd267;hb=cc27bfd7b127b045bed27ad35339dc8879317e55;hp=84783fadd6d9ff2576575698d95fa7fd8e15756d;hpb=32a70be2b337e2ac10f7c7965857b423ea53883e;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/decomission.mdwn b/input/howto/decomission.mdwn
index 84783fa..07aec80 100644
--- a/input/howto/decomission.mdwn
+++ b/input/howto/decomission.mdwn
@@ -8,7 +8,8 @@
 
  * Revoke puppet certificate
 
-   * on handel: puppet node clean $HOST
+   * on handel: puppet node clean $HOST.debian.org
+   * on handel: puppet node deactivate $HOST.debian.org
    * reinit samhain on handel
 
  * Remove from LDAP
@@ -21,30 +22,27 @@
  * Get rid of the HW (tell the hoster to get rid of it or other as appropriate)
  * Update password file information for the $HOST
  * Remove MQ queues related to machine (see [[doc/mq]] for details)
-
+```
     for queue in $(rabbitmqadmin -N rainier list queues name | \
     grep unger.debian.org | \
     awk '{print $2}') ; do
     rabbitmqadmin -N rainier -V dsa delete queue name=$queue
     done
-
+```
  * Remove disks from the MSA 
    * run multipath -ll on the KVM host and find all disks on that multipath
 
 ```
-    dm=$(sudo multipath -ll | grep "finzi-srv " | awk '{print $3}')
-    cd /sys/devices/virtual/block/$dm &&
-    for device in $(ls -1); do "echo 1 > /sys/block/$device/device/delete"; done
-    multipath -f finzi-srv
-
+echo -n "multipath device to remove: " &&
+export LC_ALL=C &&
+read path &&
+dm=$(sudo multipath -ll | grep "$path " | awk '{print $3}') &&
+cd /sys/devices/virtual/block/$dm/slaves &&
+devices=$(ls -1) &&
+blockdev --flushbufs /dev/$dm &&
+multipath -f $path &&
+for device in $(echo $devices); do blockdev --flushbufs /dev/$device; echo 1 > "/sys/block/$device/device/delete"; done
 ```
-   * for each disk in those multipath run
-
-     echo 1 > /sys/block/sdX/device/delete
-
-   * once done, remove that multpath-device from multipath
-
-     multipath -f finzi-srv
 
    * remove the paths in the MSA