Added utility02 to the cluster

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 687a8dd..b433b50 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.73"
-       DATE_="2010-11-23; last update: 2017-01-06"
+    VERSION_="1.74"
+       DATE_="2010-11-23; last update: 2017-01-13"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -1451,13 +1451,13 @@ if [ "$USE_HOSTNAME_PREFIX" = "y" ] || [ "$USE_HOSTNAME_PREFIX" = "Y" ]; then
 PRFX="$HOSTNAME_PREFIX"
 
        ### All the machines in the cluster except BRICKS and LVS servers.
-       MACHINES_NO_BRICKS_LVS="${PRFX}-db01 ${PRFX}-db02 ${PRFX}-db03 ${PRFX}-logger01 ${PRFX}-utility01 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01 ${PRFX}-memcache01 ${PRFX}-memcache02 ${PRFX}-monitor01 ${PRFX}-monitor02 ${PRFX}-backup01 ${PRFX}-admin01"
+       MACHINES_NO_BRICKS_LVS="${PRFX}-db01 ${PRFX}-db02 ${PRFX}-db03 ${PRFX}-logger01 ${PRFX}-utility01 ${PRFX}-utility02 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01 ${PRFX}-memcache01 ${PRFX}-memcache02 ${PRFX}-monitor01 ${PRFX}-monitor02 ${PRFX}-backup01 ${PRFX}-admin01"
 
        ### All the machines in the cluster except BRICKS.
-       MACHINES_NO_BRICKS="${PRFX}-lvs01 ${PRFX}-lvs02 ${PRFX}-db01 ${PRFX}-db02 ${PRFX}-db03 ${PRFX}-logger01 ${PRFX}-utility01 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01 ${PRFX}-memcache01 ${PRFX}-memcache02 ${PRFX}-monitor01 ${PRFX}-monitor02 ${PRFX}-backup01 ${PRFX}-admin01"
+       MACHINES_NO_BRICKS="${PRFX}-lvs01 ${PRFX}-lvs02 ${PRFX}-db01 ${PRFX}-db02 ${PRFX}-db03 ${PRFX}-logger01 ${PRFX}-utility01 ${PRFX}-utility02 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01 ${PRFX}-memcache01 ${PRFX}-memcache02 ${PRFX}-monitor01 ${PRFX}-monitor02 ${PRFX}-backup01 ${PRFX}-admin01"
 
        ### All OpenSRF nodes except bricks.
-       MACHINES_OSRF_NO_BRICKS="${PRFX}-utility01 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01"
+       MACHINES_OSRF_NO_BRICKS="${PRFX}-utility01 ${PRFX}-utility02 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01"
 
        ### Only LVS machines.
        MACHINES_LVS_ONLY="${PRFX}-lvs01 ${PRFX}-lvs02"
@@ -1475,7 +1475,7 @@ PRFX="$HOSTNAME_PREFIX"
        MACHINES_LOGGER="${PRFX}-logger01"
        
        ### Only utility machines.
-       MACHINES_UTILITY="${PRFX}-utility01"
+       MACHINES_UTILITY="${PRFX}-utility01 ${PRFX}-utility02"
 
        ### Only backup machines.
        MACHINES_BACKUP="${PRFX}-backup01"
@@ -1491,13 +1491,13 @@ else
 ### Without hostname prefix.
 
        ### All the machines in the cluster except BRICKS and LVS servers.
-       MACHINES_NO_BRICKS_LVS="db01 db02 db03 logger01 utility01 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+       MACHINES_NO_BRICKS_LVS="db01 db02 db03 logger01 utility01 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
 
        ### All the machines in the cluster except BRICKS.
-       MACHINES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+       MACHINES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
 
        ### All OpenSRF nodes except bricks.
-       MACHINES_OSRF_NO_BRICKS="utility01 sip01 sip02 reporter01"
+       MACHINES_OSRF_NO_BRICKS="utility01 utility02 sip01 sip02 reporter01"
 
        ### Only LVS machines.
        MACHINES_LVS_ONLY="lvs01 lvs02"
@@ -1515,7 +1515,7 @@ else
         MACHINES_LOGGER="logger01"
 
        ### Only utility machines.
-        MACHINES_UTILITY="utility01"
+        MACHINES_UTILITY="utility01 utility02"
 
         ### Only backup machines.
         MACHINES_BACKUP="backup01"
@@ -1527,7 +1527,7 @@ else
         MACHINES_REPORTER="reporter01"
 fi
 
-HOSTNAMES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+HOSTNAMES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
 
 ### Setup Privatenet IP for all hosts except bricks.
 if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
@@ -1548,6 +1548,7 @@ DB01_IP="${PRIVATENET}.101"
 DB02_IP="${PRIVATENET}.102"
 DB03_IP="${PRIVATENET}.103"
 UTILITY01_IP="${PRIVATENET}.111"
+UTILITY01_IP="${PRIVATENET}.112"
 LOGGER01_IP="${PRIVATENET}.121"
 SIP01_IP="${PRIVATENET}.131"
 SIP02_IP="${PRIVATENET}.132"
@@ -1909,6 +1910,7 @@ for BRICK in $(seq $BRICKCOUNT)
        [ -e "${CUSTOMDIR}/zips.txt" ] && eval cp -f "${CUSTOMDIR}/zips.txt"  ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/zips.txt
         eval cp -f $TEMPLATEDIR/opensrf_core.xml ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/conf
        eval sed -i "s^UTILITY01_IP^$UTILITY01_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
+       eval sed -i "s^UTILITY02_IP^$UTILITY02_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
        eval sed -i "s^REPORTER_OUTPUT_NFS_HOST_IP^$REPORTS_NFS_HOSTNAME_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
         eval sed -i "s^Brick_head_Fqdn^$(eval echo \$BRICKHOSTNAME${BRICK}_HEAD).$CLUSTERDOMAINNAME^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/openils/conf/opensrf_core.xml
         #eval sed -i "s^OpenSRF_Password^$OPENSRF_PASSWORD^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/openils/conf/opensrf_core.xml
@@ -2061,6 +2063,7 @@ for BRICK in $(seq $BRICKCOUNT)
        [ -e "${CERT_DIR}/ca.crt" ] && eval cp -f "${CERT_DIR}/ca.crt" ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/etc/apache2/ssl
        [ -e "${CUSTOMDIR}/zips.txt" ] && eval cp -f "${CUSTOMDIR}/zips.txt"  ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/var/data/zips.txt
        eval sed -i "s^UTILITY01_IP^$UTILITY01_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
+       eval sed -i "s^UTILITY02_IP^$UTILITY02_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
         eval sed -i "s^REPORTER_OUTPUT_NFS_HOST_IP^$REPORTS_NFS_HOSTNAME_IP^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/etc/eg_fstab_head
        eval cp -f $TEMPLATEDIR/opensrf_core.xml ${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-head/openils/conf
        eval sed -i "s^Brick_head_Fqdn^$(eval echo \$BRICKHOSTNAME${BRICK}_HEAD).$CLUSTERDOMAINNAME^g" ${OUTDIR}/$(eval echo \$BRICKHOSTNAME${BRICK})/$(eval echo \$BRICKHOSTNAME${BRICK})-head/openils/conf/opensrf_core.xml
@@ -2195,6 +2198,7 @@ for BRICK in $(seq $BRICKCOUNT)
                eval sed -i "s^CLUSTER_DOMAINNAME^${CLUSTERDOMAINNAME}^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/setup-drone.sh"
                eval sed -i "s^HEAD_IP^$(eval echo \$BRICKHOSTNAME${BRICK}_HEAD_IP)^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/eg_fstab_drone"
                eval sed -i "s^UTILITY01_IP^$UTILITY01_IP^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/eg_fstab_drone"
+               eval sed -i "s^UTILITY02_IP^$UTILITY02_IP^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/eg_fstab_drone"
                eval sed -i "s^Priv_IP^$(eval echo \$BRICKHOSTNAME${BRICK}_DRONE${DRONE}_IP)^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/network/interfaces"
                eval sed -i "s^Priv_NET^$PRIVATENET^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/network/interfaces"
                eval sed -i "s^LVS01_Private_IP^$LVS01_PRIVATE_IP^g" "${OUTDIR}/\$BRICKHOSTNAME${BRICK}/\$BRICKHOSTNAME${BRICK}-drone0${DRONE}/etc/network/interfaces"
@@ -2909,6 +2913,7 @@ echo "** Make sure the database servers have a minimum of 128GB RAM" >> "$NETCFG
 echo >> "$NETCFGFILE"
 echo "Utility">> "$NETCFGFILE"
 echo "utility01 IP Address set to: $UTILITY01_IP" >> "$NETCFGFILE"
+echo "utility02 IP Address set to: $UTILITY02_IP" >> "$NETCFGFILE"
 echo >> "$NETCFGFILE"
 echo "Logger" >> "$NETCFGFILE"
 echo "logger01 IP Address set to: $LOGGER01_IP" >> "$NETCFGFILE"

diff --git a/templates/eg_fstab_drone b/templates/eg_fstab_drone
index 99017de..6d09236 100644 (file)
--- a/templates/eg_fstab_drone
+++ b/templates/eg_fstab_drone
@@ -1,3 +1,4 @@
 ## NFS Mounts for Evergreen.
 HEAD_IP:/openils      /openils        nfs     ro,auto 0       0
 UTILITY01_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
+UTILITY02_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0

diff --git a/templates/eg_fstab_head b/templates/eg_fstab_head
index 5ccd800..cb05a99 100644 (file)
--- a/templates/eg_fstab_head
+++ b/templates/eg_fstab_head
@@ -1,4 +1,6 @@
 ## NFS Mounts for Evergreen.
 UTILITY01_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
 UTILITY01_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
+UTILITY02_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
+UTILITY02_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
 REPORTER_OUTPUT_NFS_HOST_IP:/storage/reports-output /openils/var/web/reporter/ nfs rw 0 0

diff --git a/templates/hosts-footer b/templates/hosts-footer
index 39f0a53..386c9fb 100644 (file)
--- a/templates/hosts-footer
+++ b/templates/hosts-footer
@@ -2,6 +2,7 @@ Priv_NET.101    db01.sampledomain.org db01
 Priv_NET.102   db02.sampledomain.org db02
 Priv_NET.103   db03.sampledomain.org db03
 Priv_NET.111   utility01.sampledomain.org public.utility01.sampledomain.org private.utility01.sampledomain.org utility01
+Priv_NET.112   utility02.sampledomain.org public.utility02.sampledomain.org private.utility02.sampledomain.org utility02
 Priv_NET.121   logger01.sampledomain.org logger01
 Priv_NET.131   sip01.sampledomain.org public.sip01.sampledomain.org private.sip01.sampledomain.org sip01 
 Priv_NET.132   sip02.sampledomain.org public.sip02.sampledomain.org private.sip02.sampledomain.org sip02