openstack/devstack
Code Issues Proposed changes

Merge "Fix service start sequence"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 05:22:29 +00:00 committed by Gerrit Code Review
commit e9431ed6a9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -769,8 +769,8 @@ function start_nova_rest {
} }
function start_nova { function start_nova {
start_nova_compute
start_nova_rest start_nova_rest
start_nova_compute
} }
function stop_nova_compute { function stop_nova_compute {

13
stack.sh
View File

@ -1030,6 +1030,14 @@ if is_service_enabled key; then
fi fi
# ZeroMQ
# ------
if is_service_enabled zeromq; then
echo_summary "Starting zeromq receiver"
run_process zeromq "$OSLO_BIN_DIR/oslo-messaging-zmq-receiver"
fi
# Horizon # Horizon
# ------- # -------
@ -1208,11 +1216,6 @@ if is_service_enabled nova; then
iniset $NOVA_CONF keymgr fixed_key $(generate_hex_string 32) iniset $NOVA_CONF keymgr fixed_key $(generate_hex_string 32)
fi fi
if is_service_enabled zeromq; then
echo_summary "Starting zermomq receiver"
run_process zeromq "$OSLO_BIN_DIR/oslo-messaging-zmq-receiver"
fi
# Launch the nova-api and wait for it to answer before continuing # Launch the nova-api and wait for it to answer before continuing
if is_service_enabled n-api; then if is_service_enabled n-api; then
echo_summary "Starting Nova API" echo_summary "Starting Nova API"