openstack
/
nova
Code Issues Proposed changes

remove unused functions 

This removes all the odd start / stop functions that should not be used

Change-Id: Idc5c0ca929b5f53bf55cbcf4297a590e7e0e2eff
This commit is contained in:
Sean Dague 2017-05-02 10:36:30 -04:00
parent e59eee6db5
commit 4eec543090
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/live_migration/hooks/run_tests.sh
View File

@ -23,8 +23,6 @@ SUBNODES=$(cat /etc/nodepool/sub_nodes_private)
SERVICE_HOST=$primary_node
STACK_USER=${STACK_USER:-stack}
populate_start_script
echo '1. test with all local storage (use default for volumes)'
echo 'NOTE: test_volume_backed_live_migration is skipped due to https://bugs.launchpad.net/nova/+bug/1524898'
run_tempest "block migration test" "^.*test_live_migration(?!.*(test_volume_backed_live_migration))"

62
nova/tests/live_migration/hooks/utils.sh
View File

@ -9,65 +9,3 @@ function run_tempest {
die $LINENO "$message failure"
fi
}
function populate_start_script {
SCREEN_NAME=${SCREEN_NAME:-stack}
DEST=${DEST:-/opt/stack}
SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}
ENABLED_SERVICES=${ENABLED_SERVICES:-n-cpu,g-api,c-vol}
LIBVIRT_GROUP=${LIBVIRT_GROUP:-libvirtd}
TIMESTAMP_FORMAT=${TIMESTAMP_FORMAT:-"%F-%H%M%S"}
LOGDAYS=${LOGDAYS:-7}
CURRENT_LOG_TIME=$(date "+$TIMESTAMP_FORMAT")
#creates script for starting process without screen and copies it to all
# nodes
#
# args:
# $1 - service name to start
# $2 - command to execute
# $3 - group to run under
cat > /tmp/start_process.sh <<EOF
set -x
service=\$1
command=\$2
sg=\$3
ENABLED_SERVICES=$ENABLED_SERVICES
SCREEN_NAME=$SCREEN_NAME
DEST=$DEST
SERVICE_DIR=$SERVICE_DIR
LOGDIR=$DEST/logs
TIMESTAMP_FORMAT=$TIMESTAMP_FORMAT
LOGDAYS=$LOGDAYS
CURRENT_LOG_TIME=\$(date "+$TIMESTAMP_FORMAT")
REAL_LOG_FILE="\$LOGDIR/\$service.log.\$CURRENT_LOG_TIME"
if [[ -n "\$LOGDIR" ]]; then
exec 1>&"\$REAL_LOG_FILE" 2>&1
ln -sf "\$REAL_LOG_FILE" \$LOGDIR/\$service.log
export PYTHONUNBUFFERED=1
fi
if [[ -n "\$sg" ]]; then
setsid sg \$sg -c "\$command" & echo \$! >\$SERVICE_DIR/\$SCREEN_NAME/\$service.pid
else
setsid \$command & echo \$! >\$SERVICE_DIR/\$SCREEN_NAME/\$service.pid
fi
exit 0
EOF
chmod +x /tmp/start_process.sh
$ANSIBLE subnodes --sudo -f 5 -i "$WORKSPACE/inventory" -m copy -a "src=/tmp/start_process.sh dest=/tmp/start_process.sh owner=$STACK_USER group=$STACK_USER mode=0777"
$ANSIBLE subnodes --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "ls -la /tmp/start_process.sh"
}
function stop {
local target=$1
local service=$2
$ANSIBLE $target --sudo -f 5 -i "$WORKSPACE/inventory" -m shell -a "
executable=/bin/bash
BASE\=$BASE
source $BASE/new/devstack/functions-common
ENABLED_SERVICES\=$ENABLED_SERVICES
SCREEN_NAME\=$SCREEN_NAME
SERVICE_DIR\=$SERVICE_DIR
stop_process $service
"
}