Added utility03 host and fix areas missing utility02 host.

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 038868e..6a4a8c3 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.77"
-       DATE_="2010-11-23; last update: 2017-04-25"
+    VERSION_="1.78"
+       DATE_="2010-11-23; last update: 2017-06-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}-utility02 ${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}-utility03 ${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}-utility02 ${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}-utility03 ${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}-utility02 ${PRFX}-sip01 ${PRFX}-sip02 ${PRFX}-reporter01"
+       MACHINES_OSRF_NO_BRICKS="${PRFX}-utility01 ${PRFX}-utility02 ${PRFX}-utility03 ${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 ${PRFX}-utility02"
+       MACHINES_UTILITY="${PRFX}-utility01 ${PRFX}-utility02 ${PRFX}-utility03"
 
        ### 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 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+       MACHINES_NO_BRICKS_LVS="db01 db02 db03 logger01 utility01 utility02 utility03 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 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+       MACHINES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 utility02 utility03 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
 
        ### All OpenSRF nodes except bricks.
-       MACHINES_OSRF_NO_BRICKS="utility01 utility02 sip01 sip02 reporter01"
+       MACHINES_OSRF_NO_BRICKS="utility01 utility02 utility03 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 utility02"
+        MACHINES_UTILITY="utility01 utility02 utility03"
 
         ### 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 utility02 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
+HOSTNAMES_NO_BRICKS="lvs01 lvs02 db01 db02 db03 logger01 utility01 utility02 utility03 sip01 sip02 reporter01 memcache01 memcache02 monitor01 monitor02 backup01 admin01"
 
 ### Setup Privatenet IP for all hosts except bricks.
 if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
@@ -1549,6 +1549,7 @@ DB02_IP="${PRIVATENET}.102"
 DB03_IP="${PRIVATENET}.103"
 UTILITY01_IP="${PRIVATENET}.111"
 UTILITY02_IP="${PRIVATENET}.112"
+UTILITY03_IP="${PRIVATENET}.113"
 LOGGER01_IP="${PRIVATENET}.121"
 SIP01_IP="${PRIVATENET}.131"
 SIP02_IP="${PRIVATENET}.132"
@@ -1911,6 +1912,7 @@ for BRICK in $(seq $BRICKCOUNT)
         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^UTILITY03_IP^$UTILITY03_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
@@ -2064,6 +2066,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 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^UTILITY03_IP^$UTILITY03_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
@@ -2199,6 +2202,7 @@ for BRICK in $(seq $BRICKCOUNT)
                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^UTILITY03_IP^$UTILITY03_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"
@@ -2923,6 +2927,7 @@ echo >> "$NETCFGFILE"
 echo "Utility">> "$NETCFGFILE"
 echo "utility01 IP Address set to: $UTILITY01_IP" >> "$NETCFGFILE"
 echo "utility02 IP Address set to: $UTILITY02_IP" >> "$NETCFGFILE"
+echo "utility03 IP Address set to: $UTILITY03_IP" >> "$NETCFGFILE"
 echo >> "$NETCFGFILE"
 echo "Logger" >> "$NETCFGFILE"
 echo "logger01 IP Address set to: $LOGGER01_IP" >> "$NETCFGFILE"

diff --git a/templates/hosts-footer b/templates/hosts-footer
index 386c9fb..2e58159 100644 (file)
--- a/templates/hosts-footer
+++ b/templates/hosts-footer
@@ -3,6 +3,7 @@ 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.113    utility03.sampledomain.org public.utility03.sampledomain.org private.utility03.sampledomain.org utility03
 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

diff --git a/templates/hosts-footer-prefixed b/templates/hosts-footer-prefixed
index 1773ca5..cb4ecb6 100644 (file)
--- a/templates/hosts-footer-prefixed
+++ b/templates/hosts-footer-prefixed
@@ -2,6 +2,8 @@ Priv_NET.101    PREFIX-db01.sampledomain.org PREFIX-db01
 Priv_NET.102   PREFIX-db02.sampledomain.org PREFIX-db02
 Priv_NET.103   PREFIX-db03.sampledomain.org PREFIX-db03
 Priv_NET.111   PREFIX-utility01.sampledomain.org public.PREFIX-utility01.sampledomain.org private.PREFIX-utility01.sampledomain.org PREFIX-utility01
+Priv_NET.112    PREFIX-utility02.sampledomain.org public.PREFIX-utility02.sampledomain.org private.PREFIX-utility02.sampledomain.org PREFIX-utility02
+Priv_NET.113    PREFIX-utility03.sampledomain.org public.PREFIX-utility03.sampledomain.org private.PREFIX-utility03.sampledomain.org PREFIX-utility03
 Priv_NET.121   PREFIX-logger01.sampledomain.org PREFIX-logger01
 Priv_NET.131   PREFIX-sip01.sampledomain.org public.PREFIX-sip01.sampledomain.org private.PREFIX-sip01.sampledomain.org PREFIX-sip01
 Priv_NET.132   PREFIX-sip02.sampledomain.org public.PREFIX-sip02.sampledomain.org private.PREFIX-sip02.sampledomain.org PREFIX-sip02
@@ -11,6 +13,8 @@ Priv_NET.152  PREFIX-memcache02.sampledomain.org PREFIX-memcache02
 Priv_NET.171   PREFIX-backup01.sampledomain.org PREFIX-backup01
 Priv_NET.201   PREFIX-monitor01.sampledomain.org PREFIX-monitor01
 Priv_NET.211   PREFIX-admin01.sampledomain.org PREFIX-admin01
+Priv_NET.202    PREFIX-monitor02.sampledomain.org monitor02
+Priv_NET.211    PREFIX-admin01.sampledomain.org admin01
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     localhost ip6-localhost ip6-loopback

diff --git a/templates/lvs/bind/revzonefile-footer b/templates/lvs/bind/revzonefile-footer
index 92d448c..2c3a9d7 100644 (file)
--- a/templates/lvs/bind/revzonefile-footer
+++ b/templates/lvs/bind/revzonefile-footer
@@ -4,6 +4,12 @@
 111    IN      PTR     utility01.domain.org. 
 111    IN      PTR     public.utility01.domain.org. 
 111    IN      PTR     private.utility01.domain.org.
+112     IN      PTR     utility02.domain.org.
+112     IN      PTR     public.utility02.domain.org.
+112     IN      PTR     private.utility02.domain.org.
+113     IN      PTR     utility03.domain.org.
+113     IN      PTR     public.utility03.domain.org.
+113     IN      PTR     private.utility03.domain.org.
 121    IN      PTR     logger01.domain.org. 
 131    IN      PTR     sip01.domain.org. 
 131    IN      PTR     public.sip01.domain.org. 

diff --git a/templates/lvs/bind/revzonefile-footer-prefixed b/templates/lvs/bind/revzonefile-footer-prefixed
index 311117b..e463a99 100644 (file)
--- a/templates/lvs/bind/revzonefile-footer-prefixed
+++ b/templates/lvs/bind/revzonefile-footer-prefixed
@@ -4,6 +4,12 @@
 111    IN      PTR     PREFIX-utility01.domain.org. 
 111    IN      PTR     public.PREFIX-utility01.domain.org. 
 111    IN      PTR     private.PREFIX-utility01.domain.org.
+112     IN      PTR     PREFIX-utility02.domain.org.
+112     IN      PTR     public.PREFIX-utility02.domain.org.
+112     IN      PTR     private.PREFIX-utility02.domain.org.
+113     IN      PTR     PREFIX-utility03.domain.org.
+113     IN      PTR     public.PREFIX-utility03.domain.org.
+113     IN      PTR     private.PREFIX-utility03.domain.org.
 121    IN      PTR     PREFIX-logger01.domain.org. 
 131    IN      PTR     PREFIX-sip01.domain.org. 
 131    IN      PTR     public.PREFIX-sip01.domain.org. 

diff --git a/templates/lvs/bind/zonefile-footer b/templates/lvs/bind/zonefile-footer
index b513c03..7f0b9d1 100644 (file)
--- a/templates/lvs/bind/zonefile-footer
+++ b/templates/lvs/bind/zonefile-footer
@@ -2,8 +2,14 @@ db01   A       Priv_NET.101
 db02   A       Priv_NET.102
 db03   A       Priv_NET.103
 utility01      A       Priv_NET.111
+utility02       A       Priv_NET.112
+utility03       A       Priv_NET.113
 public.utility01       A       Priv_NET.111
 private.utility01      A       Priv_NET.111
+public.utility02        A       Priv_NET.112
+private.utility02       A       Priv_NET.112
+public.utility03        A       Priv_NET.113
+private.utility03       A       Priv_NET.113
 logger01       A       Priv_NET.121
 sip01          A       Priv_NET.131
 public.sip01   A       Priv_NET.131

diff --git a/templates/lvs/bind/zonefile-footer-prefixed b/templates/lvs/bind/zonefile-footer-prefixed
index 0fe640b..ae9fdfc 100644 (file)
--- a/templates/lvs/bind/zonefile-footer-prefixed
+++ b/templates/lvs/bind/zonefile-footer-prefixed
@@ -4,6 +4,12 @@ PREFIX-db03                    A       Priv_NET.103
 PREFIX-utility01               A       Priv_NET.111
 PREFIX-public.utility01                A       Priv_NET.111
 PREFIX-private.utility01       A       Priv_NET.111
+PREFIX-utility02                A       Priv_NET.112
+PREFIX-public.utility02         A       Priv_NET.112
+PREFIX-private.utility02        A       Priv_NET.112
+PREFIX-utility03                A       Priv_NET.113
+PREFIX-public.utility03         A       Priv_NET.113
+PREFIX-private.utility03        A       Priv_NET.113
 PREFIX-logger01                        A       Priv_NET.121
 PREFIX-sip01                   A       Priv_NET.131
 PREFIX-public.sip01            A       Priv_NET.131