openstack/devstack
Code Issues Proposed changes

Bind Marconi to SERVICE_HOST & add health check

Browse Source 
This patch,
1. Binds Marconi to SERVICE_HOST, to be consistent with other services.
2. Adds a health check to verify if marconi started correctly.

Change-Id: I1d48d0e610369cc97d479a5cd47b2bd11656da3f
This commit is contained in:
Malini Kamalambal 2014-02-20 14:48:59 -05:00
parent 5d920e02e3
commit 67df3b2fc2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/marconi
View File

@ -51,6 +51,11 @@ MARCONI_BRANCH=${MARCONI_BRANCH:-master}
MARCONICLIENT_REPO=${MARCONICLIENT_REPO:-${GIT_BASE}/openstack/python-marconiclient.git} MARCONICLIENT_REPO=${MARCONICLIENT_REPO:-${GIT_BASE}/openstack/python-marconiclient.git}
MARCONICLIENT_BRANCH=${MARCONICLIENT_BRANCH:-master} MARCONICLIENT_BRANCH=${MARCONICLIENT_BRANCH:-master}
# Set Marconi Connection Info
MARCONI_SERVICE_HOST=${MARCONI_SERVICE_HOST:-$SERVICE_HOST}
MARCONI_SERVICE_PORT=${MARCONI_SERVICE_PORT:-8888}
MARCONI_SERVICE_PROTOCOL=${MARCONI_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,marconi TEMPEST_SERVICES+=,marconi
@ -89,7 +94,7 @@ function configure_marconi() {
sudo chown $USER $MARCONI_API_LOG_DIR sudo chown $USER $MARCONI_API_LOG_DIR
iniset $MARCONI_CONF DEFAULT verbose True iniset $MARCONI_CONF DEFAULT verbose True
iniset $MARCONI_CONF 'drivers:transport:wsgi' bind '0.0.0.0' iniset $MARCONI_CONF 'drivers:transport:wsgi' bind $MARCONI_SERVICE_HOST
iniset $MARCONI_CONF keystone_authtoken auth_protocol http iniset $MARCONI_CONF keystone_authtoken auth_protocol http
iniset $MARCONI_CONF keystone_authtoken admin_user marconi iniset $MARCONI_CONF keystone_authtoken admin_user marconi
@ -142,6 +147,10 @@ function install_marconiclient() {
# start_marconi() - Start running processes, including screen # start_marconi() - Start running processes, including screen
function start_marconi() { function start_marconi() {
screen_it marconi-server "marconi-server --config-file $MARCONI_CONF" screen_it marconi-server "marconi-server --config-file $MARCONI_CONF"
echo "Waiting for Marconi to start..."
if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q -O- $MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT/v1/health; do sleep 1; done"; then
die $LINENO "Marconi did not start"
fi
} }
# stop_marconi() - Stop running processes # stop_marconi() - Stop running processes
@ -176,9 +185,9 @@ function create_marconi_accounts() {
openstack endpoint create \ openstack endpoint create \
$MARCONI_SERVICE \ $MARCONI_SERVICE \
--region RegionOne \ --region RegionOne \
--publicurl "http://$SERVICE_HOST:8888" \ --publicurl "$MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT" \
--adminurl "http://$SERVICE_HOST:8888" \ --adminurl "$MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT" \
--internalurl "http://$SERVICE_HOST:8888" --internalurl "$MARCONI_SERVICE_PROTOCOL://$MARCONI_SERVICE_HOST:$MARCONI_SERVICE_PORT"
fi fi
} }