openstack/grenade
Code Issues Proposed changes

Merge "Need to get more of the setup stack.sh does for Nova"

Browse Source
This commit is contained in:
Jenkins 2013-03-15 22:48:44 +00:00 committed by Gerrit Code Review
commit ff83186f39
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
upgrade-nova
View File

@ -62,14 +62,27 @@ BASE_SQL_CONN=$(source $BASE_DEVSTACK_DIR/stackrc; echo ${BASE_SQL_CONN:-mysql:/
cd $TARGET_DEVSTACK_DIR
source $TARGET_DEVSTACK_DIR/stackrc
DATA_DIR=${DEST}/data
SERVICE_HOST=${SERVICE_HOST:-localhost}
# From stack.sh
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
HOST_IP=$(get_default_host_ip $FIXED_RANGE $FLOATING_RANGE "$HOST_IP_IFACE" "$HOST_IP")
if [ "$HOST_IP" == "" ]; then
die $LINENO "Could not determine host ip address. Either localrc specified dhcp on ${HOST_IP_IFACE} or defaulted"
fi
SERVICE_HOST=${SERVICE_HOST:-$HOST_IP}
SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME:-service}
S3_SERVICE_PORT=${S3_SERVICE_PORT:-8080}
source $TARGET_DEVSTACK_DIR/lib/database
# Just do this rather than bring in all of glance
GLANCE_HOSTPORT=$SERVICE_HOST:9292
SYSLOG=`trueorfalse False $SYSLOG`
# Get functions from current DevStack
source $TARGET_DEVSTACK_DIR/lib/rpc_backend
source $TARGET_DEVSTACK_DIR/lib/nova
source $TARGET_DEVSTACK_DIR/lib/baremetal
source $TARGET_DEVSTACK_DIR/lib/quantum
@ -101,9 +114,17 @@ create_nova_keys_dir
# Migrate the database
nova-manage --config-file $NOVA_CONF db sync || die $LINENO "DB sync error"
# Get stuff from stack.sh
create_nova_conf_nova_network
iniset $NOVA_CONF DEFAULT ec2_dmz_host "$SERVICE_HOST"
iniset_rpc_backend nova $NOVA_CONF DEFAULT
iniset $NOVA_CONF DEFAULT glance_api_servers "$GLANCE_HOSTPORT"
# Need to set the default compute driver
iniset $NOVA_CONF DEFAULT compute_driver libvirt.LibvirtDriver
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
# Start Nova