Refine koji upgrade instructions

docs/koji/upgrading.md

@@ -36,6 +36,9 @@ You may want to install the test rpm from <linuxsoft.cern.ch/internal/repos/linu
 
 ## Disable alerts
 
+!!! Note ""
+    These wassh commands may not work for the case of 2FA protected nodes, so you may need to run it yourself from within those.
+
 Make sure Roger knows something is going on:
 
 ```
@@ -66,7 +69,9 @@ mco puppet disable "koji upgrade OTGXXXXXX" --dm puppetdb -T lsb -F 'hostgroup_1
 # test
 wassh -l root -c lsb/test2 'puppet agent --disable'
 # prod
-wassh -l root -c lsb 'puppet agent --disable'
+wassh -l root -c lsb/hub 'puppet agent --disable'
+wassh -l root -c lsb/web 'puppet agent --disable'
+wassh -l root -c lsb/builder 'puppet agent --disable'
 ```
 
 *builders*
@@ -128,12 +133,6 @@ rpm2cpio koji-1.18.1-1.el7.cern.noarch.rpm | cpio -idv ./usr/share/doc/koji-1.18
 scp usr/share/doc/koji-1.18.1/docs/schema-upgrade-1.17-1.18.sql aiadm:
 ```
 
-
-*Initialise postgresql 9.6 environment*
-```
-ssh aiadm
-scl enable rh-postgresql96 /bin/bash
-```
 *dump existing db*
 ```
 pg_dump -h $dbod.cern.ch -p $port -d $database -U $username > kojitest_1.17-`date +%Y%m%d%H%M`.sql
@@ -164,7 +163,9 @@ mco shell run '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh' --dm pu
 # test
 wassh -l root -c lsb/test2 '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh'
 # prod
-wassh -l root -c lsb '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh'
+wassh -l root -c lsb/hub '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh'
+wassh -l root -c lsb/web '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh'
+wassh -l root -c lsb/builder '/usr/bin/yum clean all && /usr/local/sbin/distro_sync.sh'
 ```
 
 ## Restart Koji
@@ -186,6 +187,7 @@ wassh -l root -c lsb/test2 'puppet agent --enable'
 wassh -l root -c lsb/test2 'sudo roger update --all_alarms true'
 
 # prod
-wassh -l root -c lsb 'puppet agent --enable'
-wassh -l root -c lsb 'sudo roger update --all_alarms true'
+wassh -l root -c lsb/hub 'puppet agent --enable && sudo roger update --all_alarms true'
+wassh -l root -c lsb/web 'puppet agent --enable && sudo roger update --all_alarms true'
+wassh -l root -c lsb/builder 'puppet agent --enable && sudo roger update --all_alarms true'
 ```