Update crons/switches to match new machines.

mmascher · Jul 23, 2015 · 202be1a · 202be1a
1 parent 727649f
commit 202be1a
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 33 deletions.
diff --git a/admin/deploy b/admin/deploy
@@ -35,7 +35,7 @@ deploy_admin_post()
 
   local pxlabel pxskip certs
   case $host in
-    vocms034 |   vocms0127 | vocms13[2345689] | vocms013[12345689] | vocms140 | vocms0140 | vocms16[01235] | vocms016[01235] | vocms030[67] | vocms0318 )
+    vocms0127 | vocms013[1245689] | vocms0140 | vocms016[01235] | vocms030[67] | vocms0318 )
       pxlabel=cmsweb_backends ;;
     * )
       pxlabel=devvm_$(echo $host | tr - _) ;;

diff --git a/base/deploy b/base/deploy
@@ -16,6 +16,6 @@ deploy_base_sw()
 
 deploy_base_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms013[89] | vocms0140 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot) | crontab -
 }
diff --git a/bigcouch/deploy b/bigcouch/deploy
@@ -41,7 +41,7 @@ deploy_bigcouch_post()
 
   (mkcrontab
    case $host in
-     vocms34 | vocms13[2689] | vocms16[13] | vocms140 |  vocms034 | vocms0128 | vocms013[2689] | vocms016[135] | vocms0140 | vocms0306 | vocms0307 | vocms0318 )
+     vocms013[2689] | vocms016[135] | vocms0140 | vocms0306 | vocms0307 | vocms0318 )
        disable ;;
      * )
        enable

diff --git a/couchdb/deploy b/couchdb/deploy
@@ -61,7 +61,7 @@ deploy_couchdb_post()
        case $host in
          vocms0127 ) tohost=vocms0127 hour=1;;
          vocms0132 ) tohost=vocms0131 hour=1;;
-         vocms0133 | vocms0131 ) tohost=vocms0132 hour=2;;
+         vocms0131 ) tohost=vocms0132 hour=2;;
          vocms0140 ) tohost=vocms0131 hour=3;;
          vocms0306 | vocms0318 ) tohost=vocms0140 hour=4;;
          vocms0307 ) tohost=vocms0140 hour=5;;

diff --git a/crabcache/deploy b/crabcache/deploy
@@ -17,7 +17,7 @@ deploy_crabcache_sw()
 
 deploy_crabcache_post()
 {
-  case $host in vocms13[39] | vocms127 | vocms013[123] | vocms012[78] | vocms0140 | vocms030[67] | vocms0318 ) enable ;; vocms* ) disable ;; * ) enable ;; esac
+  case $host in vocms013[12] | vocms0127 | vocms0140 | vocms030[67] | vocms0318 ) enable ;; vocms* ) disable ;; * ) enable ;; esac
 
   local cmd_u="$root/current/config/crabcache/manage clean 3"
   cmd_u="sudo -H -u _crabcache bashs -l -c \"${cmd_u}\""

diff --git a/crabserver/deploy b/crabserver/deploy
@@ -38,7 +38,7 @@ deploy_crabserver_sw()
 
 deploy_crabserver_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
 
   (mkcrontab; sysboot) | crontab -
 }

diff --git a/das/deploy b/das/deploy
@@ -21,7 +21,7 @@ deploy_das_sw()
 
 deploy_das_post()
 {
-  case $host in vocms34 | vocms13[2689] | vocms16[13] | vocms034 | vocms013[689] | vocms016[135] ) disable ;; * ) enable ;; esac
+  case $host in vocms013[689] | vocms016[135] ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot) | crontab -
   # clean-up
   local das_stage=$root/state/das/stagingarea

diff --git a/dbs/deploy b/dbs/deploy
@@ -24,12 +24,12 @@ deploy_dbs_sw()
 
 deploy_dbs_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
 
   (mkcrontab
    sysboot
    case $host in
-     vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
+     vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
        ;;
      * )
        local cmd="$project_config/manage setinstances 'I did read documentation'"

diff --git a/dbsmigration/deploy b/dbsmigration/deploy
@@ -24,12 +24,12 @@ deploy_dbsmigration_sw()
 
 deploy_dbsmigration_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
 
   (mkcrontab
    sysboot
    case $host in
-     vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
+     vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
        ;;
      * )
        local cmd="$project_config/manage setinstances 'I did read documentation'"

diff --git a/dbsweb/deploy b/dbsweb/deploy
@@ -33,6 +33,6 @@ deploy_dbsweb_sw()
 
 deploy_dbsweb_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms013[89] | vocms0140 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot) | crontab -
 }
diff --git a/dmwmbld/deploy b/dmwmbld/deploy
@@ -69,7 +69,7 @@ deploy_dmwmbld_post()
   ) | crontab -
 
   case $host:$root in
-    vocms106:/build/dmwmbld/srv | vocms22:/build/dmwmbld/srv | vocms0106:/build/dmwmbld/srv | vocms022:/build/dmwmbld/srv )
+    vocms0106:/build/dmwmbld/srv | vocms022:/build/dmwmbld/srv )
       klist -s # must have afs kerberos token
       (acrontab -l | { fgrep -v -e " $host $project_config/" -e "$host ssh macms07" || true; }
        echo "*/10 * * * * $host $project_config/dmwmbld_task updateweb"

diff --git a/dmwmmon/deploy b/dmwmmon/deploy
@@ -29,7 +29,7 @@ deploy_dmwmmon_sw()
 deploy_dmwmmon_post()
 {
   case $host in
-    vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
+    vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
       disable
       opts="" ;;
     * )

diff --git a/dqmgui/deploy b/dqmgui/deploy
@@ -49,7 +49,7 @@ deploy_dqmgui_sw()
 deploy_dqmgui_post()
 {
   case $host in
-    vocms34 | vocms13[26] | vocms140 | vocms16[135] | vocms034 | vocms0128 | vocms013[26] | vocms0140 | vocms016[135] | vocms030[67] | vocms0318 )
+    vocms013[26] | vocms0140 | vocms016[135] | vocms030[67] | vocms0318 )
       disable
       ;;
     * )
@@ -72,7 +72,7 @@ deploy_dqmgui_post()
    }) | crontab -
 
   case $host:$root in
-    vocms13[389]:/data/srv | vocms013[1389]:/data/srv | broen* )
+    vocms13[89]:/data/srv | vocms013[189]:/data/srv | broen* )
       klist -s # must have afs kerberos token
       (acrontab -l | { egrep -v -e " $host.*$project_config/" || true; }
 

diff --git a/filemover/deploy b/filemover/deploy
@@ -30,7 +30,7 @@ deploy_filemover_post()
 {
   (mkcrontab
    case $host in
-     vocms34 | vocms13[2689] | vocms16[13] | vocms034 | vocms013[2689] | vocms016[13])
+     vocms013[2689] | vocms016[135])
        disable ;;
      * )
        enable

diff --git a/gitweb/deploy b/gitweb/deploy
@@ -18,7 +18,7 @@ deploy_gitweb_sw()
 
 deploy_gitweb_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable;; * ) enable;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable;; * ) enable;; esac
 
   rm -fr $PWD/{htdocs,etc,var}
   (set -e

diff --git a/mongodb/deploy b/mongodb/deploy
@@ -16,6 +16,6 @@ deploy_mongodb_sw()
 
 deploy_mongodb_post()
 {
-  case $host in vocms34 | vocms13[2689] | vocms16[13] | vocms034 | vocms013[689] | vocms016[135] ) disable ;; * ) enable ;; esac
+  case $host in vocms013[689] | vocms016[135] ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot) | crontab -
 }
diff --git a/overview/deploy b/overview/deploy
@@ -16,8 +16,7 @@ deploy_overview_sw()
 
 deploy_overview_post()
 {
-  case $host in vocms34 | vocms13[3689] | vocms140 | vocms161 | vocms034 | vocms013[13689] | vocms0128 | vocms0140 | vocms0161 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; 
-esac
+  case $host in vocms013[1689] | vocms0140 | vocms016[15] | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot
    cmd="$project_config/daily"
    $nogroups || cmd="sudo -H -u _overview bashs -l -c '$cmd'"

diff --git a/phedex/deploy b/phedex/deploy
@@ -34,7 +34,7 @@ deploy_phedex_sw()
 deploy_phedex_post()
 {
   case $host in
-    vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
+    vocms013[89] | vocms0140 | vocms030[67] | vocms0318 )
       disable
       opts="" ;;
     * )

diff --git a/reqmgr/ReqMgrConfig.py b/reqmgr/ReqMgrConfig.py
@@ -13,11 +13,11 @@
 COUCH = "https://%s/couchdb" % HOST
 ADD_MONITOR_FLAG = False
 
-if re.match(r"^vocms0?(?:34|128|13[689]|140|16[135]|30[67]|318)\.cern\.ch$", HOST):
+if re.match(r"^vocms0(?:13[689]|140|16[135]|30[67]|318)\.cern\.ch$", HOST):
   COUCH = "https://cmsweb.cern.ch/couchdb"
-elif re.match(r"^vocms0?(?:13[123])\.cern\.ch$", HOST):
+elif re.match(r"^vocms0(?:13[12])\.cern\.ch$", HOST):
   COUCH = "https://cmsweb-testbed.cern.ch/couchdb"
-elif re.match(r"^vocms0?127\.cern\.ch$", HOST):
+elif re.match(r"^vocms0127\.cern\.ch$", HOST):
   COUCH = "https://cmsweb-dev.cern.ch/couchdb"
 
 config = ReqMgrConfig.reqMgrConfig(installation=INSTALL,

diff --git a/reqmgr/deploy b/reqmgr/deploy
@@ -64,7 +64,7 @@ deploy_reqmgr_sw()
 
 deploy_reqmgr_post()
 {
-  case $host in vocms13[89] | vocms013[89] ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] ) disable ;; * ) enable ;; esac
 
   case $variant in
     offsite )

diff --git a/reqmgr2/deploy b/reqmgr2/deploy
@@ -44,7 +44,7 @@ deploy_reqmgr2_sw()
 
 deploy_reqmgr2_post()
 {
-  case $host in vocms13[89] | vocms013[89] ) disable;;  * ) enable;; esac
+  case $host in vocms013[89] ) disable;;  * ) enable;; esac
 
   # ReqMgr2 specific couchdb stuff
   # Tell couch to pick up reqmgr on the next restart

diff --git a/sitedb/deploy b/sitedb/deploy
@@ -18,16 +18,16 @@ deploy_sitedb_sw()
 
 deploy_sitedb_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
   (mkcrontab
    sysboot
    # hack: set cronjob to restart sitedb due to bug on the ldap synchronization
    case $host in
-     vocms34 | vocms13[2389] | vocms140 | vocms16[13] | vocms034 | vocms0128 | vocms013[123689] | vocms0140 | vocms016[35] | vocms030[67] | vocms0318 ) ;;
-     * )
+     vocms0161 | vocms0127 )
        local cmd="$project_config/manage start 'I did read documentation'"
        $nogroups || cmd="sudo -H -u _sitedb bashs -l -c \"${cmd}\""
        echo "5 */6 * * * $cmd &> /dev/null" ;;
+     * ) ;;
    esac) | crontab -
 }
 

diff --git a/system/deploy b/system/deploy
@@ -368,7 +368,7 @@ deploy_system_post()
 
           note "IMPORTANT: run the following to update /root/.ssh/known_hosts"
           note "   sudo cfg/admin/ImageKey start"
-          note "   for h in vocms{0,}{306,307,318,34,12{7,8},13{1,2,3,4,5,6,8,9},140,16{0,1,2,3,4,5}}{,.cern.ch}; do"
+          note "   for h in vocms0{306,307,318,12{7,8},13{1,2,4,5,6,8,9},140,16{0,1,2,3,4,5}}{,.cern.ch}; do"
           note "     echo \$h; sudo cfg/admin/ImageKey run ssh cmsweb@\$h uptime"
           note "   done"
           note "   sudo cfg/admin/ImageKey stop"

diff --git a/t0wmadatasvc/deploy b/t0wmadatasvc/deploy
@@ -17,7 +17,7 @@ deploy_t0wmadatasvc_sw()
 
 deploy_t0wmadatasvc_post()
 {
-  case $host in vocms13[89] | vocms140 | vocms0128 | vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
+  case $host in vocms013[89] | vocms0140 | vocms030[67] | vocms0318 ) disable ;; * ) enable ;; esac
   (mkcrontab; sysboot) | crontab -
 }
 

diff --git a/workqueue/monitoring.ini b/workqueue/monitoring.ini
@@ -1,4 +1,4 @@
-ENABLE_IF='host not in ["vocms34","vocms132","vocms136","vocms138","vocms139","vocms161","vocms163","vocms034","vocms0128","vocms0306","vocms0318","vocms0132","vocms0136","vocms0138","vocms0139","vocms0161","vocms0163"]'
+ENABLE_IF='host in ["vocms0140","vocms0131","vocms0127"]'
 
 # Glob pattern to search for log files under the svc logs directory,
 # and the regular expression to look for in those files.