Index: trunk/shell/compute-node-model-start
===================================================================
--- trunk/shell/compute-node-model-start	(revision 44)
+++ trunk/shell/compute-node-model-start	(revision 45)
@@ -1,8 +1,8 @@
 #! /bin/bash -x
 #
-# ST - 2012-05-25
+# ST - 2012-07-03
 #
-# Start the front end.
+# Start the compute node model.
 #
 # Get the directory of the script.
 SCRIPT_PATH=`dirname $0`
@@ -11,9 +11,9 @@
 # Source the common configuration variables.
 . $SCRIPT_PATH/c-i-a-b.common
 #
-CURRENT_HOST_NAME=$FRONT_END_HOST_NAME
+CURRENT_HOST_NAME=$COMPUTE_NODE_MODEL_HOST_NAME
 #
-CPUS_LIST=$FRONT_END_CPUS_LIST
+CPUS_LIST=$COMPUTE_NODE_MODEL_CPUS_LIST
 CPUS=""
 for i in $CPUS_LIST
   do
Index: trunk/shell/front-end-finish-up
===================================================================
--- trunk/shell/front-end-finish-up	(revision 44)
+++ trunk/shell/front-end-finish-up	(revision 45)
@@ -25,12 +25,12 @@
 CURRENT_PATH=/etc/xen
 cp templates$CURRENT_PATH/$CONST_FRONT_END_XEN_TEMPLATE_NAME \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __FRONT_END_KERNEL__ $FRONT_END_KERNEL \
+rpl -q Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
+rpl -q __FRONT_END_KERNEL__ $FRONT_END_KERNEL \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __FRONT_END_RAMDISK__ $FRONT_END_RAMDISK \
+rpl -q __FRONT_END_RAMDISK__ $FRONT_END_RAMDISK \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __FRONT_END_VCPUS_NUM__ $FRONT_END_VCPUS_NUM \
+rpl -q __FRONT_END_VCPUS_NUM__ $FRONT_END_VCPUS_NUM \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 CPUS_LIST=$FRONT_END_CPUS_LIST
 CPUS=""
@@ -43,39 +43,39 @@
         CPUS="$CPUS,$i"
     fi
 done
-rpl __FRONT_END_CPUS__ $CPUS \
+rpl -q __FRONT_END_CPUS__ $CPUS \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Memory
-rpl __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
+rpl -q __FRONT_END_MEMORY__ $FRONT_END_MEMORY \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Root device
-rpl __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
+rpl -q __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 #
 # System disk stuff
 FRONT_END_SYSTEM_DISK_STANZA="'phy:${FRONT_END_SYSTEM_VOLUME_GROUP_DEVICE}/${FRONT_END_SYSTEM_DISK},$FRONT_END_SYSTEM_VIRTUAL_VOLUME,w'"
-rpl __FRONT_END_SYSTEM_DISK_STANZA__ "$FRONT_END_SYSTEM_DISK_STANZA" \
+rpl -q __FRONT_END_SYSTEM_DISK_STANZA__ "$FRONT_END_SYSTEM_DISK_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Home disk stuff
 FRONT_END_HOME_DISK_STANZA="'phy:${FRONT_END_HOME_VOLUME_GROUP_DEVICE}/${FRONT_END_HOME_DISK},$FRONT_END_HOME_VIRTUAL_VOLUME,w'"
-rpl __FRONT_END_HOME_DISK_STANZA__ "$FRONT_END_HOME_DISK_STANZA" \
+rpl -q __FRONT_END_HOME_DISK_STANZA__ "$FRONT_END_HOME_DISK_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Swap disk stuff.
 if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
   FRONT_END_SWAP_DISK_STANZA="'phy:${FRONT_END_SWAP_VOLUME_GROUP_DEVICE}/${FRONT_END_SWAP_DISK},$FRONT_END_SWAP_VIRTUAL_VOLUME,w'"
-  rpl __FRONT_END_SWAP_DISK_STANZA__ $FRONT_END_SWAP_DISK_STANZA \
+  rpl -q __FRONT_END_SWAP_DISK_STANZA__ $FRONT_END_SWAP_DISK_STANZA \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   # Comment out the noswap stanza.
-  rpl __FRONT_END_NOSWAP__ "#$CLUSTER_NOSWAP" \
+  rpl -q __FRONT_END_NOSWAP__ "#$CLUSTER_NOSWAP" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 else
-  echo y | rpl -f __FRONT_END_SWAP_DISK_STANZA__ "" \
+  rpl -q __FRONT_END_SWAP_DISK_STANZA__ "" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-  rpl __FRONT_END_NOSWAP__ $CLUSTER_NOSWAP \
+  rpl -q __FRONT_END_NOSWAP__ $CLUSTER_NOSWAP \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 fi
 #
-rpl __FRONT_END_HOST_NAME__ $CURRENT_HOST_NAME \
+rpl -q __FRONT_END_HOST_NAME__ $CURRENT_HOST_NAME \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Vif stuff.
 VIF_STANZA=$CONST_XEN_VIF_STANZA_PREFIX
@@ -84,20 +84,20 @@
 INTERNAL_BRIDGE="${CONST_XEN_BRIDGE_PREFIX}${CLUSTER_BRIDGE_NAME}"
 INTERNAL_IP="${CONST_XEN_IP_PREFIX}${FRONT_END_CLUSTER_STATIC_IP}"
 if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ;then
-  rpl __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
+  rpl -q __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   VIF_STANZA=${VIF_STANZA}${EXTERNAL_MAC}"','"${INTERNAL_IP}","${INTERNAL_MAC}","${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
 else
   # Comment out the DHCP_STANZA.
-  rpl __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
+  rpl -q __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   VIF_STANZA=${VIF_STANZA}${EXTERNAL_IP}","${EXTERNAL_MAC}",'"${INTERNAL_IP}","${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
 fi
 # In any case, write the VIF_STANZA
-rpl __VIF_STANZA__ "$VIF_STANZA" \
+rpl -q __VIF_STANZA__ "$VIF_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Console stuff as extra parameter
-rpl __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
+rpl -q __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # End creation of Xen configuration file.
 #
@@ -142,46 +142,46 @@
    $FRONT_END_FILE_SYSTEM_MOUNT_POINT$CURRENT_PATH/interfaces
 if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ; then
   ETH0_STANZA="iface eth0 inet dhcp"
-  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
+  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_ADDRESS__ "" \
+  rpl -q __ETH0_STATIC_ADDRESS__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NETMASK__ "" \
+  rpl -q __ETH0_STATIC_NETMASK__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NETWORK__ "" \
+  rpl -q __ETH0_STATIC_NETWORK__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_GATEWAY__ "" \
+  rpl -q __ETH0_STATIC_GATEWAY__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_BROADCAST__ "" \
+  rpl -q __ETH0_STATIC_BROADCAST__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "" \
+  rpl -q __ETH0_STATIC_NAMESERVERS__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "" \
+  rpl -q __ETH0_STATIC_DNS_SEARCH__ "" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
 else
   ETH0_STANZA="iface eth0 inet static"
-  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
+  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_ADDRESS__ "$FRONT_END_CLUSTER_STATIC_IP" \
+  rpl -q __ETH0_STATIC_ADDRESS__ "$FRONT_END_CLUSTER_STATIC_IP" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NETMASK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETMASK" \
+  rpl -q __ETH0_STATIC_NETMASK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETMASK" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NETWORK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETWORK" \
+  rpl -q __ETH0_STATIC_NETWORK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETWORK" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_GATEWAY__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
+  rpl -q __ETH0_STATIC_GATEWAY__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_BROADCAST__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
+  rpl -q __ETH0_STATIC_BROADCAST__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
+  rpl -q __ETH0_STATIC_NAMESERVERS__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
+  rpl-q __ETH0_STATIC_DNS_SEARCH__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
       ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
 fi 
 # Static address on the cluster interface.
 ADDRESS="${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}"
-rpl __ETH1_STATIC_ADDRESS__ $ADDRESS  \
+rpl -q __ETH1_STATIC_ADDRESS__ $ADDRESS  \
     ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-rpl __ETH1_STATIC_NETMASK__ $CLUSTER_STATIC_NETMASK  \
+rpl -q __ETH1_STATIC_NETMASK__ $CLUSTER_STATIC_NETMASK  \
     ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
     
 # /etc/hostname
@@ -195,9 +195,9 @@
 CURRENT_PATH=/etc
 cp $TEMPLATES_DIR$CURRENT_PATH/resolv.conf \
    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
-rpl __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
+rpl -q __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
-rpl __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
+rpl -q __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
 #
 # /etc/fstab
@@ -208,12 +208,12 @@
   # Front-End System Disk Line
 FESDL=${FRONT_END_SYSTEM_VIRTUAL_VOLUME_DEVICE}
 FESDL="$FESDL	/		$FRONT_END_SYSTEM_DISK_FILE_SYSTEM	errors=remount-ro	0	1"
-rpl __FRONT_END_SYSTEM_DISK_LINE__ "$FESDL" \
+rpl -q __FRONT_END_SYSTEM_DISK_LINE__ "$FESDL" \
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
   # Font-End Home Disk Line
 FEHDL=${FRONT_END_HOME_VIRTUAL_VOLUME_DEVICE}
 FEHDL="$FEHDL	/home		$FRONT_END_HOME_DISK_FILE_SYSTEM	errors=remount-ro	0	2"
-rpl __FRONT_END_HOME_DISK_LINE__ "$FEHDL" \
+rpl -q __FRONT_END_HOME_DISK_LINE__ "$FEHDL" \
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
   # Font-End Swap Disk Line
 if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
@@ -222,8 +222,8 @@
 else
   FESDL=""
 fi
-# "rpl -f" since $FESDL can be an empty string.
-rpl -f __FRONT_END_SWAP_DISK_LINE__ "$FESDL" \
+# "rpl -q" since $FESDL can be an empty string.
+rpl -q __FRONT_END_SWAP_DISK_LINE__ "$FESDL" \
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
 #
 # End /etc/fstab stuff.
@@ -240,12 +240,12 @@
 cp ${TEMPLATES_DIR}${CURRENT_PATH}/${FRONT_END_EXPORTS_TEMPLATE} \
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
 NFS_HOME_STANZA="$CLUSTER_STATIC_NETWORK_PREFIX.0/${CLUSTER_STATIC_NETMASK}$FRONT_END_NFS_OPTIONS"
-rpl __NFS_HOME_STANZA__ "$NFS_HOME_STANZA" \
+rpl -q __NFS_HOME_STANZA__ "$NFS_HOME_STANZA" \
   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
 #
 # End NFS V4 stuff.
 #
-# Umount the compute node system disk
+# Umount the front-end system disk
 #
 # Order matters since the /home file system is mounted on the
 # on the system partition
Index: trunk/shell/c-i-a-b.common
===================================================================
--- trunk/shell/c-i-a-b.common	(revision 44)
+++ trunk/shell/c-i-a-b.common	(revision 45)
@@ -4,7 +4,9 @@
 # Compute nodes from 1 to 250
 CONST_COMPUTE_NODE="compute-node"
 CONST_COMPUTE_NODE_MAX_NUM=250
+CONST_COMPUTE_NODE_MODEL="compute-node-model"
 CONST_COMPUTE_NODE_MODEL_CLUSTER_STATIC_NETWORK_POSTFIX=252
+CONST_COMPUTE_NODE_MODEL_XEN_TEMPLATE_NAME="${CONST_COMPUTE_NODE_MODEL}.cfg"
 CONST_DHCP_HOSTS_FILE_BASENAME=dhcp-hostsfile
 CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX=251
 CONST_FRONT_END="front-end"
@@ -60,30 +62,64 @@
 CLUSTER_STATIC_NETWORK_PREFIX="192.168.1"
 CLUSTER_SWAP_SIZE=$CONST_NULL_DISK_SIZE
 #
+# All compute nodes.
+#
 COMPUTE_NODE_BRIDGE=$CLUSTER_BRIDGE_NAME
 COMPUTE_NODE_CPUS_FILE=compute-nodes-cpus
 COMPUTE_NODE_DISK_MOUNT_POINT=/mnt/${CONST_COMPUTE_NODE}-system-disk
+COMPUTE_NODE_FSTAB_TEMPLATE=${CONST_FSTAB_FILE_BASENAME}.${CONST_COMPUTE_NODE}
+COMPUTE_NODE_HOME_DISK_FILE_SYSTEM=nfs4
 COMPUTE_NODE_INTERFACES_TEMPLATE=interfaces.${CONST_COMPUTE_NODE}
 COMPUTE_NODE_KERNEL=/boot/vmlinuz-`uname -r`
 COMPUTE_NODE_MAX_NUM=250
-COMPUTE_NODE_MEMORY=3072
-COMPUTE_NODE_MODEL_CLUSTER_STATIC_IP="$CLUSTER_STATIC_NETWORK_PREFIX.$CONST_COMPUTE_NODE_MODEL_CLUSTER_STATIC_NETWORK_POSTFIX"
-COMPUTE_NODE_MODEL_EXTERNAL_MAC_ADDRESS="${CLUSTER_EXTERNAL_MAC_PREFIX}01"
-COMPUTE_NODE_MODEL_STATIC_IP_EXTERNAL=
-COMPUTE_NODE_MODEL_HOST_NAME="tamadi-1-cnm"
-COMPUTE_NODE_MODEL_CLUSTER_HOST_NAME="compute-node-model"
+COMPUTE_NODE_MEMORY=2048
 COMPUTE_NODE_NAME_PREFIX="${CONST_COMPUTE_NODE}-"
 COMPUTE_NODE_RAMDISK=/boot/initrd.img-`uname -r`
 COMPUTE_NODE_STATIC_NETWORK_PREFIX=$CLUSTER_STATIC_NETWORK_PREFIX
 COMPUTE_NODE_SWAP_DISK_POSTFIX=$CONST_SWAP_POSTFIX
 COMPUTE_NODE_SWAP_DISK_PREFIX=$CONST_COMPUTE_NODE
-COMPUTE_NODE_SWAP_DISK_SIZE=1G
-SWAP_DISK_VOLUME_GROUP=/dev/vg_fast
+#COMPUTE_NODE_SWAP_DISK_SIZE=1G
+COMPUTE_NODE_SWAP_DISK_SIZE=$CONST_NULL_DISK_SIZE # No swap disk.
+COMPUTE_NODE_SWAP_DISK_VOLUME_GROUP=vg_fast
+COMPUTE_NODE_SWAP_DISK_VOLUME_GROUP_DEVICE="/dev/$COMPUTE_NODE_SWAP_DISK_VOLUME_GROUP"
+COMPUTE_NODE_SWAP_VIRTUAL_VOLUME=$CONST_XEN_VIRTUAL_DRIVE_2
+COMPUTE_NODE_SYSTEM_DISK_FILE_SYSTEM="ext3"
+COMPUTE_NODE_SYSTEM_VIRTUAL_VOLUME=$CONST_XEN_VIRTUAL_DRIVE_1
 #
+# Compute node model specific.
 #
+COMPUTE_NODE_MODEL_CLUSTER_HOST_NAME="$CONST_COMPUTE_NODE_MODEL"
+COMPUTE_NODE_MODEL_CLUSTER_STATIC_IP="$CLUSTER_STATIC_NETWORK_PREFIX.$CONST_COMPUTE_NODE_MODEL_CLUSTER_STATIC_NETWORK_POSTFIX"
+COMPUTE_NODE_MODEL_CPUS_LIST=20
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_NETMASK=255.255.255.0
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_NETWORK=140.77.15.0
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_GATEWAY=140.77.15.1
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_BROADCAST=140.77.15.255
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS="140.77.1.32 140.77.167.2"
+COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH="lip.ens-lyon.fr ens-lyon.fr resam.ens-lyon.fr"
+COMPUTE_NODE_MODEL_EXTERNAL_MAC_ADDRESS="${CLUSTER_EXTERNAL_MAC_PREFIX}01"
+COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT=/mnt/compute-node-model-file-system
+COMPUTE_NODE_MODEL_STATIC_IP_EXTERNAL=
+COMPUTE_NODE_MODEL_HOST_NAME="tamadi-1-cnm"
+COMPUTE_NODE_MODEL_INTERFACES_TEMPLATE=interfaces.${CONST_COMPUTE_NODE_MODEL}
+COMPUTE_NODE_MODEL_SWAP_DISK="${CONST_COMPUTE_NODE_MODEL}-${CONST_SWAP_DISK_POSTFIX}"
+COMPUTE_NODE_MODEL_SWAP_DISK_SIZE=$CONST_NULL_DISK_SIZE # No swap disk.
+COMPUTE_NODE_MODEL_SYSTEM_DISK="${CONST_COMPUTE_NODE_MODEL}-${CONST_SYSTEM_DISK_POSTFIX}"
+COMPUTE_NODE_MODEL_SYSTEM_DISK_SIZE=48G
+COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP="vg_slow"
+COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP_DEVICE="/dev/$COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP"
+COMPUTE_NODE_MODEL_SYSTEM_VIRTUAL_VOLUME=$CONST_XEN_VIRTUAL_DRIVE_1
+COMPUTE_NODE_MODEL_SYSTEM_VIRTUAL_VOLUME_DEVICE="/dev/$COMPUTE_NODE_MODEL_SYSTEM_VIRTUAL_VOLUME"
+COMPUTE_NODE_MODEL_VCPUS_NUM=1   # We use the manycores configuration here.
+#
+#
 DOM0_CPUS_LIST="0 4"
 DOM0_CPUS_NUM=2
 DOM0_CPUS_CLAUSE="(dom0-cpus $DOM0_CPUS_NUM)"
+#
+#
+#
+FRONT_END_CLUSTER_HOST_NAME=front-end
 FRONT_END_CLUSTER_STATIC_IP="$CLUSTER_STATIC_NETWORK_PREFIX.$CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX"
 FRONT_END_CPUS_LIST="8 12 16"
 FRONT_END_EXPORTS_TEMPLATE=${CONST_EXPORTS_FILE_BASENAME}.${CONST_FRONT_END}
@@ -120,8 +156,8 @@
 FRONT_END_SWAP_VOLUME_GROUP=vg_fast
 FRONT_END_SWAP_VOLUME_GROUP_DEVICE="/dev/$FRONT_END_SWAP_VOLUME_GROUP"
 FRONT_END_SYSTEM_DISK="${CONST_FRONT_END}-${CONST_SYSTEM_DISK_POSTFIX}"
-#FRONT_END_SYSTEM_DISK_SIZE=46G
-FRONT_END_SYSTEM_DISK_SIZE=10G
+FRONT_END_SYSTEM_DISK_SIZE=46G
+#FRONT_END_SYSTEM_DISK_SIZE=10G
 FRONT_END_SYSTEM_DISK_FILE_SYSTEM=ext3
 FRONT_END_SYSTEM_VIRTUAL_VOLUME=$CONST_XEN_VIRTUAL_DRIVE_1
 FRONT_END_SYSTEM_VIRTUAL_VOLUME_DEVICE="/dev/$FRONT_END_SYSTEM_VIRTUAL_VOLUME"
Index: trunk/shell/compute-node-model-finish-up
===================================================================
--- trunk/shell/compute-node-model-finish-up	(revision 44)
+++ trunk/shell/compute-node-model-finish-up	(revision 45)
@@ -3,6 +3,7 @@
 # ST - 2012-05-25
 #
 # Finish up the compute node model installation.
+# Prerequisite: the system must be mounted.
 #
 # Get the directory of the script.
 SCRIPT_PATH=`dirname $0`
@@ -11,7 +12,7 @@
 # Source the common configuration variables.
 . $SCRIPT_PATH/c-i-a-b.common
 
-CURRENT_HOST_NAME=$COMPUT_NODE_MODEL_HOST_NAME
+CURRENT_HOST_NAME=$COMPUTE_NODE_MODEL_HOST_NAME
 #
 # Get the cluster MAC address
 #
@@ -23,14 +24,14 @@
 # Create the Xen configuration file from a template
 #
 CURRENT_PATH=/etc/xen
-cp templates$CURRENT_PATH/$CONST_COMPUTE_NODEL_MODEL_XEN_TEMPLATE_NAME \
+cp templates$CURRENT_PATH/$CONST_COMPUTE_NODE_MODEL_XEN_TEMPLATE_NAME \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __COMPUTE_NODE_KERNEL__ $COMPUTE_NODE_KERNEL \
+rpl -q Template Configuration $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
+rpl -q __COMPUTE_NODE_KERNEL__ "$COMPUTE_NODE_KERNEL" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __COMPUTE_NODE_RAMDISK__ $COMPUTE_NODE_RAMDISK \
+rpl -q __COMPUTE_NODE_RAMDISK__ "$COMPUTE_NODE_RAMDISK" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-rpl __COMPUTE_NODE_MODEL_VCPUS_NUM__ $COMPUTE_NODEL_MODEL_VCPUS_NUM \
+rpl -q __COMPUTE_NODE_MODEL_VCPUS_NUM__ "$COMPUTE_NODE_MODEL_VCPUS_NUM" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 CPUS_LIST=$COMPUTE_NODE_MODEL_CPUS_LIST
 CPUS=""
@@ -43,76 +44,76 @@
         CPUS="$CPUS,$i"
     fi
 done
-rpl __COMPUTE_NODE_MODEL_CPUS__ $CPUS \
+rpl -q __COMPUTE_NODE_MODEL_CPUS__ "$CPUS" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Memory
-rpl __COMPUTE_NODE_MEMORY__ $COMPUTE_NODE_MEMORY \
+rpl -q __COMPUTE_NODE_MEMORY__ "$COMPUTE_NODE_MEMORY" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Root device
-rpl __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
+rpl -q __XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA__ "$CONST_XEN_SYSTEM_DISK_ROOT_DEVICE_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 #
 # System disk stuff
-COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA="'phy:${COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP_DEVICE}/${COMPUTE_NODE_MODEL_SYSTEM_DISK},$COMPUTE_NODE_VOLUME_SYSTEM_VIRTUAL_VOLUME,w'"
-rpl __COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA__ "$COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA" \
+COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA="'phy:${COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP_DEVICE}/${COMPUTE_NODE_MODEL_SYSTEM_DISK},$COMPUTE_NODE_SYSTEM_VIRTUAL_VOLUME,w'"
+rpl -q __COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA__ "$COMPUTE_NODE_MODEL_SYSTEM_DISK_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # No home disk stuff: home is network mounted.
 #
 # Swap disk stuff.
-if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
-  FRONT_END_SWAP_DISK_STANZA="'phy:${FRONT_END_SWAP_VOLUME_GROUP_DEVICE}/${FRONT_END_SWAP_DISK},$FRONT_END_SWAP_VIRTUAL_VOLUME,w'"
-  rpl __FRONT_END_SWAP_DISK_STANZA__ $FRONT_END_SWAP_DISK_STANZA \
+if [ "x$COMPUTE_NODE_MODEL_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
+  COMPUTE_NODE_MODEL_SWAP_DISK_STANZA="'phy:${COMPUTE_NODE_SWAP_DISK_VOLUME_GROUP_DEVICE}/${COMPUTE_NODE_MODEL_SWAP_DISK},$COMPUTE_NODE_SWAP_VIRTUAL_VOLUME,w'"
+  rpl -q __COMPUTE_NODE_MODEL_SWAP_DISK_STANZA__ "$COMPUTE_NODE_MODEL_SWAP_DISK_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   # Comment out the noswap stanza.
-  rpl __FRONT_END_NOSWAP__ "#$CLUSTER_NOSWAP" \
+  rpl -q __COMPUTE_NODE_MODEL_NOSWAP__ "#$CLUSTER_NOSWAP" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 else
-  echo y | rpl -f __FRONT_END_SWAP_DISK_STANZA__ "" \
+  rpl -q __COMPUTE_NODE_MODEL_SWAP_DISK_STANZA__ "" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
-  rpl __FRONT_END_NOSWAP__ $CLUSTER_NOSWAP \
+  rpl -q __COMPUTE_NODE_MODEL_NOSWAP__ "$CLUSTER_NOSWAP" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 fi
 #
-rpl __FRONT_END_HOST_NAME__ $CURRENT_HOST_NAME \
+rpl -q __COMPUTE_NODE_MODEL_HOST_NAME__ "$CURRENT_HOST_NAME" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Vif stuff.
 VIF_STANZA=$CONST_XEN_VIF_STANZA_PREFIX
-EXTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${FRONT_END_EXTERNAL_MAC_ADDRESS}"
-INTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${FRONT_END_CLUSTER_MAC_ADDRESS}"
+EXTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${COMPUTE_NODE_MODEL_EXTERNAL_MAC_ADDRESS}"
+INTERNAL_MAC="${CONST_XEN_MAC_PREFIX}${COMPUTE_NODE_MODEL_CLUSTER_MAC_ADDRESS}"
 INTERNAL_BRIDGE="${CONST_XEN_BRIDGE_PREFIX}${CLUSTER_BRIDGE_NAME}"
-INTERNAL_IP="${CONST_XEN_IP_PREFIX}${FRONT_END_CLUSTER_STATIC_IP}"
-if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ;then
-  rpl __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
+INTERNAL_IP="${CONST_XEN_IP_PREFIX}${COMPUTE_NODE_MODEL_CLUSTER_STATIC_IP}"
+if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ; then
+  rpl -q __XEN_DHCP_STANZA__ "$CONST_XEN_DHCP_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   VIF_STANZA=${VIF_STANZA}${EXTERNAL_MAC}"','"${INTERNAL_IP}","${INTERNAL_MAC}","${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
 else
   # Comment out the DHCP_STANZA.
-  rpl __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
+  rpl -q __XEN_DHCP_STANZA__ "#$CONST_XEN_DHCP_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
   VIF_STANZA=${VIF_STANZA}${EXTERNAL_IP}","${EXTERNAL_MAC}",'"${INTERNAL_IP}","${INTERNAL_MAC},${INTERNAL_BRIDGE}${CONST_XEN_VIF_STANZA_POSTFIX}
 fi
 # In any case, write the VIF_STANZA
-rpl __VIF_STANZA__ "$VIF_STANZA" \
+rpl -q __VIF_STANZA__ "$VIF_STANZA" \
    $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # Console stuff as extra parameter
-rpl __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
+rpl -q __EXTRA_STANZA__ "$CONST_XEN_EXTRA_STANZA" \
      $CONST_XEN_CONFIG_DIR/$CURRENT_HOST_NAME.cfg
 # End creation of Xen configuration file.
 #
-# Complet installation
+# Complete installation
 #
 # Modules stuff.
 #
 #  Create the directory on the new image, if it does not exit yet.
-if [ ! -d $FRONT_END_FILE_SYSTEM_MOUNT_POINT/lib/modules ] ; then
-  mkdir $FRONT_END_FILE_SYSTEM_MOUNT_POINT/lib/modules
+if [ ! -d $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/lib/modules ] ; then
+  mkdir $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/lib/modules
 fi
 #
 #  Copy the modules
 #
 XEN_MODULES_DIRECTORY=`ls /lib/modules | grep xen `
 for i in $XEN_MODULES_DIRECTORY ; do
-  cp -a /lib/modules/$i $FRONT_END_FILE_SYSTEM_MOUNT_POINT/lib/modules
+  cp -a /lib/modules/$i $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/lib/modules
 done
 #
 # Module stuff done.
@@ -120,134 +121,124 @@
 # Generate or configure the specific files from templates
 #
 # Create the /etc directory, if necessary
-if [ ! -d $FRONT_END_FILE_SYSTEM_MOUNT_POINT/etc ] ; then
-  mkdir $FRONT_END_FILE_SYSTEM_MOUNT_POINT/etc
+if [ ! -d $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/etc ] ; then
+  mkdir $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/etc
 fi
+#
 # Copy the sources list
-if [ ! -d $FRONT_END_FILE_SYSTEM_MOUNT_POINT/etc/apt ] ; then
-  mkdir $FRONT_END_FILE_SYSTEM_MOUNT_POINT/etc/apt
+#
+if [ ! -d $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/etc/apt ] ; then
+  mkdir $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/etc/apt
 fi
-cp /etc/apt/sources.list $FRONT_END_FILE_SYSTEM_MOUNT_POINT/etc/apt
+cp /etc/apt/sources.list $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT/etc/apt
 
 # /etc/network/interfaces
 # The first interface is DHCP configured.
-# No '/' between $FRONT_END_FILE_SYSTEM_MOUNT_POINT and $CURRENT_PATH
+# No '/' between $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT and $CURRENT_PATH
 CURRENT_PATH=/etc/network
-if [ ! -d ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH} ] ; then
-  mkdir ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}
+if [ ! -d ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH} ] ; then
+  mkdir ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}
 fi
-cp templates$CURRENT_PATH/$FRONT_END_INTERFACES_TEMPLATE \
-   $FRONT_END_FILE_SYSTEM_MOUNT_POINT$CURRENT_PATH/interfaces
+cp templates$CURRENT_PATH/$COMPUTE_NODE_MODEL_INTERFACES_TEMPLATE \
+   $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT$CURRENT_PATH/interfaces
 if [ $CLUSTER_EXTERNAL_ADDRESSES_BY_DHCP -eq 1 ] ; then
   ETH0_STANZA="iface eth0 inet dhcp"
-  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_ADDRESS__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NETMASK__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NETWORK__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_GATEWAY__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_BROADCAST__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_ADDRESS__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_NETMASK__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_NETWORK__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_GATEWAY__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_BROADCAST__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_NAMESERVERS__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_DNS_SEARCH__ "" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
 else
   ETH0_STANZA="iface eth0 inet static"
-  rpl __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_ADDRESS__ "$FRONT_END_CLUSTER_STATIC_IP" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NETMASK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETMASK" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NETWORK__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_NETWORK" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-  echo y | rpl __ETH0_STATIC_GATEWAY__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_BROADCAST__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_NAMESERVERS__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
-  echo y | rpl __ETH0_STATIC_DNS_SEARCH__ "$FRONT_END_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
-      ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_OR_DHCP__ "$ETH0_STANZA"  \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_ADDRESS__ "$COMPUTE_NODE_MODEL_CLUSTER_STATIC_IP" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_NETMASK__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_NETMASK" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_NETWORK__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_NETWORK" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+  rpl -q __ETH0_STATIC_GATEWAY__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_GATEWAY" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_BROADCAST__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_BROADCAST" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_NAMESERVERS__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_DNS_NAMESERVERS" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces 
+  rpl -q __ETH0_STATIC_DNS_SEARCH__ "$COMPUTE_NODE_MODEL_EXTERNAL_INTERFACE_STATIC_DNS_SEARCH" \
+      ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
 fi 
 # Static address on the cluster interface.
-ADDRESS="${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}"
-rpl __ETH1_STATIC_ADDRESS__ $ADDRESS  \
-    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
-rpl __ETH1_STATIC_NETMASK__ $CLUSTER_STATIC_NETMASK  \
-    ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+ADDRESS="${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_COMPUTE_NODE_MODEL_CLUSTER_STATIC_NETWORK_POSTFIX}"
+rpl -q __ETH1_STATIC_ADDRESS__ "$ADDRESS"  \
+    ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
+rpl -q __ETH1_STATIC_NETMASK__ "$CLUSTER_STATIC_NETMASK"  \
+    ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/interfaces
     
 # /etc/hostname
 CURRENT_PATH=/etc
-echo $CURRENT_HOST_NAME > "${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/hostname"
+echo $COMPUTE_NODE_MODEL_CLUSTER_HOST_NAME > "${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/hostname"
 # /etc/hosts. Script generated.
 CURRENT_PATH=/etc
 $SCRIPT_PATH/generate-hosts-file \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/hosts
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/hosts
 # /etc/resolv.conf
 CURRENT_PATH=/etc
 cp $TEMPLATES_DIR$CURRENT_PATH/resolv.conf \
-   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
-rpl __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
-   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
-rpl __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
-   ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
+   ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
+rpl -q __CLUSTER_DOMAIN_NAME__ "${CLUSTER_DOMAIN_NAME}." \
+   ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
+rpl -q __FRONT_END_STATIC_ADDRESS__ "${CLUSTER_STATIC_NETWORK_PREFIX}.${CONST_FRONT_END_CLUSTER_STATIC_NETWORK_POSTFIX}" \
+   ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/resolv.conf
 #
 # /etc/fstab
 #
 CURRENT_PATH=/etc
-cp ${TEMPLATES_DIR}${CURRENT_PATH}/${FRONT_END_FSTAB_TEMPLATE} \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
-  # Front-End System Disk Line
-FESDL=${FRONT_END_SYSTEM_VIRTUAL_VOLUME_DEVICE}
-FESDL="$FESDL	/		$FRONT_END_SYSTEM_DISK_FILE_SYSTEM	errors=remount-ro	0	1"
-rpl __FRONT_END_SYSTEM_DISK_LINE__ "$FESDL" \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
-  # Font-End Home Disk Line
-FEHDL=${FRONT_END_HOME_VIRTUAL_VOLUME_DEVICE}
-FEHDL="$FEHDL	/home		$FRONT_END_HOME_DISK_FILE_SYSTEM	errors=remount-ro	0	2"
-rpl __FRONT_END_HOME_DISK_LINE__ "$FEHDL" \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
-  # Font-End Swap Disk Line
-if [ "x$FRONT_END_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
-  FESDL=${FRONT_END_SWAP_VIRTUAL_VOLUME_DEVICE}
-  FESDL="$FESDL	none		swap				0	0"
+cp ${TEMPLATES_DIR}${CURRENT_PATH}/${COMPUTE_NODE_FSTAB_TEMPLATE} \
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
+  # Compute-Node-Model System Disk Line
+CNMSDL=${COMPUTE_NODE_MODEL_SYSTEM_VIRTUAL_VOLUME_DEVICE}
+CNMSDL="$CNMSDL	/		$COMPUTE_NODE_SYSTEM_DISK_FILE_SYSTEM	errors=remount-ro	0	1"
+rpl -q __COMPUTE_NODE_SYSTEM_DISK_LINE__ "$CNMSDL" \
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
+  # Compute-Node-Model Home Disk Line. Computer nodes mount the /home
+  # on the front-end.
+CNMHDL="${FRONT_END_CLUSTER_HOST_NAME}:/"
+CNMHDL="$CNMHDL	/home		$COMPUTE_NODE_HOME_DISK_FILE_SYSTEM	defaults		0	0"
+rpl -q __COMPUTE_NODE_HOME_DISK_LINE__ "$CNMHDL" \
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
+  # Compute-Node-Model Swap Disk Line
+if [ "x$COMPUTE_NODE_MODEL_SWAP_DISK_SIZE" != "x$CONST_NULL_DISK_SIZE" ] ; then
+  CNMSDL=${COMPUTE_NODE_MODEL_SWAP_VIRTUAL_VOLUME_DEVICE}
+  CNMSDL="$CNMSDL	none		swap				0	0"
 else
-  FESDL=""
+  CNMSDL=""
 fi
-# "rpl -f" since $FESDL can be an empty string.
-rpl -f __FRONT_END_SWAP_DISK_LINE__ "$FESDL" \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
+# "rpl -q" since $CNMSDL can be an empty string.
+rpl -q __COMPUTE_NODE_SWAP_DISK_LINE__ "$CNMSDL" \
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/fstab
 #
 # End /etc/fstab stuff.
 #
 # /etc/inittab stuff
 #
-rpl tty1 "$CONST_XEN_VIRTUAL_CONSOLE_NAME" \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/inittab
+rpl -q tty1 "$CONST_XEN_VIRTUAL_CONSOLE_NAME" \
+  ${COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/inittab
 #
 # End /etc/inittab stuff.
 #
-# NFS V4 stuff
+# Umount the compute node model system disk
 #
-cp ${TEMPLATES_DIR}${CURRENT_PATH}/${FRONT_END_EXPORTS_TEMPLATE} \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
-NFS_HOME_STANZA="$CLUSTER_STATIC_NETWORK_PREFIX.0/${CLUSTER_STATIC_NETMASK}$FRONT_END_NFS_OPTIONS"
-rpl __NFS_HOME_STANZA__ "$NFS_HOME_STANZA" \
-  ${FRONT_END_FILE_SYSTEM_MOUNT_POINT}${CURRENT_PATH}/$CONST_EXPORTS_FILE_BASENAME
+umount $COMPUTE_NODE_MODEL_FILE_SYSTEM_MOUNT_POINT
 #
-# End NFS V4 stuff.
-#
-# Umount the compute node system disk
-#
-# Order matters since the /home file system is mounted on the
-# on the system partition
-umount $FRONT_END_FILE_SYSTEM_MOUNT_POINT/home
-umount $FRONT_END_FILE_SYSTEM_MOUNT_POINT
-#
 exit 0
Index: trunk/shell/templates/etc/dhcp-hostsfile
===================================================================
--- trunk/shell/templates/etc/dhcp-hostsfile	(revision 44)
+++ trunk/shell/templates/etc/dhcp-hostsfile	(revision 45)
@@ -248,5 +248,5 @@
 00:16:3E:0F:6A:F8,id:*,192.168.1.248,compute-node-248
 00:16:3E:0F:6A:F9,id:*,192.168.1.249,compute-node-249
 00:16:3E:0F:6A:FA,id:*,192.168.1.250,compute-node-250
-00:16:3E:0F:6A:FB,id:*,192.168.1.251,tamadi-1-fe
-00:16:3E:0F:6A:FC,id:*,192.168.1.252,tamadi-1-cnm
+00:16:3E:0F:6A:FB,id:*,192.168.1.251,front-end
+00:16:3E:0F:6A:FC,id:*,192.168.1.252,compute-node-model
Index: trunk/shell/templates/etc/fstab.compute-node
===================================================================
--- trunk/shell/templates/etc/fstab.compute-node	(revision 0)
+++ trunk/shell/templates/etc/fstab.compute-node	(revision 45)
@@ -0,0 +1,7 @@
+# /etc/fstab: static file system information for front-end virtual machine
+#
+# <file system>	<mount point>	<type>	<options>		<dump>	<pass>
+proc		/proc		proc	defaults		0	0
+__COMPUTE_NODE_SYSTEM_DISK_LINE__
+__COMPUTE_NODE_HOME_DISK_LINE__
+__COMPUTE_NODE_SWAP_DISK_LINE__
Index: trunk/shell/compute-node-model-create
===================================================================
--- trunk/shell/compute-node-model-create	(revision 44)
+++ trunk/shell/compute-node-model-create	(revision 45)
@@ -28,7 +28,7 @@
          -n  $COMPUTE_NODE_MODEL_SYSTEM_DISK \
          $COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP
 # Create a File System on the compute node model system disk.
-mkfs -t $COMPUTE_NODE_MODEL_SYSTEM_DISK_FILE_SYSTEM \
+mkfs -t $COMPUTE_NODE_SYSTEM_DISK_FILE_SYSTEM \
         $COMPUTE_NODE_MODEL_SYSTEM_VOLUME_GROUP_DEVICE/$COMPUTE_NODE_MODEL_SYSTEM_DISK
 # If necessary, create the swap volume for the compute node model.
 if [ $COMPUTE_NODE_MODEL_SWAP_DISK_SIZE != $CONST_NULL_DISK_SIZE ] ; then
