Remove unnecessary comment out lines
This commit removes some comment-outed codes. If we want to use them, we can get them from the git repository. Change-Id: Ie438c43d332d0631750f0ad458653fc40e23faad
This commit is contained in:
parent
4fa0401d33
commit
1958c1eb5e
9
clean.sh
9
clean.sh
@ -101,11 +101,6 @@ if is_service_enabled nova && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; th
|
||||
cleanup_nova_hypervisor
|
||||
fi
|
||||
|
||||
#if mount | grep $DATA_DIR/swift/drives; then
|
||||
# sudo umount $DATA_DIR/swift/drives/sdb1
|
||||
#fi
|
||||
|
||||
|
||||
# Clean out /etc
|
||||
sudo rm -rf /etc/keystone /etc/glance /etc/nova /etc/cinder /etc/swift
|
||||
|
||||
@ -123,9 +118,5 @@ if [[ -n "$SCREEN_LOGDIR" ]] && [[ -d "$SCREEN_LOGDIR" ]]; then
|
||||
sudo rm -rf $SCREEN_LOGDIR
|
||||
fi
|
||||
|
||||
# Clean up networking...
|
||||
# should this be in nova?
|
||||
# FIXED_IP_ADDR in br100
|
||||
|
||||
# Clean up files
|
||||
rm -f $TOP_DIR/.stackenv
|
||||
|
@ -122,13 +122,11 @@ while read line; do
|
||||
ver=${BASH_REMATCH[2]}
|
||||
else
|
||||
# Unhandled format in freeze file
|
||||
#echo "unknown: $p"
|
||||
continue
|
||||
fi
|
||||
echo "pip|${p}|${ver}"
|
||||
else
|
||||
# No match in freeze file
|
||||
#echo "unknown: $p"
|
||||
continue
|
||||
fi
|
||||
done <$FREEZE_FILE
|
||||
|
@ -25,11 +25,5 @@ function build_xva {
|
||||
# because rabbit won't launch with an ip addr hostname :(
|
||||
build_xva HEADNODE $HEAD_PUB_IP $HEAD_MGT_IP 1 "ENABLED_SERVICES=g-api,g-reg,key,n-api,n-sch,n-vnc,horizon,mysql,rabbit"
|
||||
|
||||
# Wait till the head node is up
|
||||
#while ! curl -L http://$HEAD_PUB_IP | grep -q username; do
|
||||
# echo "Waiting for head node ($HEAD_PUB_IP) to start..."
|
||||
# sleep 5
|
||||
#done
|
||||
|
||||
# Build the HA compute host
|
||||
build_xva COMPUTENODE $COMPUTE_PUB_IP $COMPUTE_MGT_IP 0 "ENABLED_SERVICES=n-cpu,n-net,n-api"
|
||||
|
Loading…
Reference in New Issue
Block a user