committing changes

diff --git a/.gitignore b/.gitignore
index a987bac..7f43536 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ssl_cert/
 config/
 TODO
 .GenaSYS.sh-old
+.GenaSYS.sh.swp

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 9cb82af..c16c20c 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -1005,7 +1005,6 @@ MONITOR01_IP="${PRIVATENET}.201"
 ADMIN01_IP="${PRIVATENET}.211"
 
 
-
 cp -f "$TEMPLATEDIR/ntp.conf" /tmp
 cp -f "$TEMPLATEDIR/resolv.conf" /tmp
 sed -i "s^CLUSTER_DOMAIN_NAME^$CLUSTERDOMAINNAME^g" "/tmp/resolv.conf"
@@ -1069,19 +1068,21 @@ sed -i "s^domain.org^${CLUSTERDOMAINNAME}^g" /tmp/revzonefile-footer
 ### Start reports output configuration.
 echo
 echo Begin Reports Output Confiugration.
-if [ "$REPORTS_NFS_HOSTNAME" = "db01" ]
+if [ "$CHOSEN_REPORTS_NFS_HOSTNAME" = "db01" ]
        then
        REPORTS_NFS_HOSTNAME_IP="${PRIVATENET}.101"
-               elif [ "$REPORTS_NFS_HOSTNAME" = "db02" ]
+               elif [ "$CHOSEN_REPORTS_NFS_HOSTNAME" = "db02" ]
                        then
                        REPORTS_NFS_HOSTNAME_IP="${PRIVATENET}.102"
-               elif [ "$REPORTS_NFS_HOSTNAME" = "db03" ]
+               elif [ "$CHOSEN_REPORTS_NFS_HOSTNAME" = "db03" ]
                        then
                        REPORTS_NFS_HOSTNAME_IP="${PRIVATENET}.103"
-               elif [ "$REPORTS_NFS_HOSTNAME" = "reporter01" ]
+               elif [ "$CHOSEN_REPORTS_NFS_HOSTNAME" = "reporter01" ]
                        then 
                        REPORTS_NFS_HOSTNAME_IP="${PRIVATENET}.141"
 fi
+
+
 if [ ! -z "$REPORTS_NFS_HOSTNAME" ]
        then
        if ! grep -q "$REPORTS_NFS_HOSTNAME" /tmp/hosts-footer
@@ -1626,8 +1627,15 @@ SetupInterfaces () { #Configure Interfaces file.
 #for NET_NODE in db01 db02 db03 logger01 utility01 sip01 sip02 reporter01 memcache01 memcache02 monitor01 backup01 admin01 
 for NET_NODE in $MACHINES_NO_BRICKS_LVS
        do
+       if [[ "$USE_HOSTNAME_PREFIX" = "y" || "$USE_HOSTNAME_PREFIX" = "Y" ]]
+               then
+               NODE_NO_PREFIX=$(echo $NET_NODE|awk -F"-" '{ print $2  }')
+               else
+               NODE_NO_PREFIX=$NET_NODE
+       fi
        cp -f "$TEMPLATEDIR/interfaces" "$OUTDIR/$NET_NODE/etc/network" && \
-       eval sed -i "s^Priv_IP^\$${NET_NODE^^*}_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"
+       # eval sed -i "s^Priv_IP^\$${NET_NODE^^*}_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"
+       eval sed -i "s^Priv_IP^\$${NODE_NO_PREFIX^^*}_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"
        sed -i "s^LVS01_Private_IP^$LVS01_PRIVATE_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"
        sed -i "s^LVS02_Private_IP^$LVS02_PRIVATE_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"
        sed -i "s^Cluster_Private_IP^$LVS01_PRIVATE_SHARED_IP^g" "$OUTDIR/$NET_NODE/etc/network/interfaces"