openstack/devstack
Code Issues Proposed changes

Merge "A few more NOVA_BIN_DIR cleanups."

Browse Source
This commit is contained in:
Jenkins 2012-12-03 17:04:38 +00:00 committed by Gerrit Code Review
commit 8d23b982fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack.sh
View File

@ -1543,7 +1543,7 @@ if is_service_enabled key && is_service_enabled swift3 && is_service_enabled nov
add_nova_opt "s3_affix_tenant=True"
fi
screen_it zeromq "cd $NOVA_DIR && $NOVA_DIR/bin/nova-rpc-zmq-receiver"
screen_it zeromq "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-rpc-zmq-receiver"
# Launch the nova-api and wait for it to answer before continuing
if is_service_enabled n-api; then

2
tools/configure_tempest.sh
View File

@ -185,7 +185,7 @@ SSH_TIMEOUT=4
# Whitebox testing configuration for Compute...
COMPUTE_WHITEBOX_ENABLED=True
COMPUTE_SOURCE_DIR=$NOVA_SOURCE_DIR
COMPUTE_BIN_DIR=/usr/bin/nova
COMPUTE_BIN_DIR=$NOVA_BIN_DIR
COMPUTE_CONFIG_PATH=/etc/nova/nova.conf
# TODO(jaypipes): Create the key file here... right now, no whitebox
# tests actually use a key.