restart_frontend: touchup config voodoo, sleep before registering nodes.

cs525-koala · May 2, 2011 · e826dc5 · e826dc5
1 parent 60db409
commit e826dc5
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/restart_frontend.sh b/restart_frontend.sh
@@ -10,7 +10,7 @@ CANON=`readlink -f $0`
 DIR=`dirname $CANON`
 
 # Setup environment variables
-. $DIR/setup_vars
+#. $DIR/setup_vars
 
 # Sanity checks
 if [[ $UID -ne 0 ]]; then
@@ -19,14 +19,13 @@ if [[ $UID -ne 0 ]]; then
 fi
 
 make install
-
+#
 ##echo "Fixing xenbr0 -> br0 in eucalyptus.conf..."
 ##sed -i "s/xenbr0/br0/" $EUCALYPTUS/etc/eucalyptus/eucalyptus.conf || echo "Search/Replace failed, probably already fixed..."
 
 echo "Reconfiguring eucalyptus, and fixing permissions..."
-$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
 chown eucalyptus $EUCALYPTUS -R
-$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
+$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --setup --user eucalyptus
 
 echo "Stopping services..."
 $EUCALYPTUS/etc/init.d/eucalyptus-cloud stop
@@ -36,16 +35,18 @@ $EUCALYPTUS/etc/init.d/eucalyptus-cc stop
 echo "Removing CC's cached state..."
 rm $EUCALYPTUS/var/lib/eucalyptus/CC/*Cache || echo "No cache found, ignoring..."
 
-echo "Reconfiguring eucalyptus, and fixing permissions...(again)"
-$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
-chown eucalyptus $EUCALYPTUS -R
-$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
+#echo "Reconfiguring eucalyptus, and fixing permissions...(again)"
+#$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
+#chown eucalyptus $EUCALYPTUS -R
+#$EUCALYPTUS/usr/sbin/euca_conf  -d $EUCALYPTUS --hypervisor kvm --instances /vm_instances/ --user eucalyptus --setup
 
 echo "Starting services..."
 $EUCALYPTUS/etc/init.d/eucalyptus-cloud start
 $EUCALYPTUS/etc/init.d/eucalyptus-cc start
 ##$EUCALYPTUS/etc/init.d/eucalyptus-nc start
 
+sleep 3
+
 echo "Registering cn71 -> cn74 CCT nodes..."
 su eucalyptus -c "$EUCALYPTUS/usr/sbin/euca_conf --register-nodes cn71.cloud.cs.illinois.edu"
 su eucalyptus -c "$EUCALYPTUS/usr/sbin/euca_conf --register-nodes cn72.cloud.cs.illinois.edu"