openstack/devstack
Code Issues Proposed changes

Adds elasticsearch support as a pre-req for the glance-index.

Browse Source 
Add elastic search pkg installation and start into the glance install
and start paths.

Change-Id: I53fc37225dd606f627c9f967083007613eb1f1bb
Implements: blueprint catalog-index-service
This commit is contained in:
Wayne Okuma 2015-01-22 16:06:41 -08:00
parent 7ec3772d5f
commit 00d0da36af
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/debs/general
View File

@ -27,3 +27,4 @@ libyaml-dev
libffi-dev libffi-dev
libssl-dev # for pyOpenSSL libssl-dev # for pyOpenSSL
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
openjdk-7-jre-headless # NOPRIME

1
files/rpms/general
View File

@ -26,3 +26,4 @@ bc
libyaml-devel libyaml-devel
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
net-tools net-tools
java-1.7.0-openjdk-headless # NOPRIME

9
lib/glance Normal file → Executable file
View File

@ -70,7 +70,6 @@ GLANCE_REGISTRY_PORT_INT=${GLANCE_REGISTRY_PORT_INT:-19191}
# Tell Tempest this project is present # Tell Tempest this project is present
TEMPEST_SERVICES+=,glance TEMPEST_SERVICES+=,glance
# Functions # Functions
# --------- # ---------
@ -308,6 +307,10 @@ function install_glance {
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
setup_develop $GLANCE_DIR setup_develop $GLANCE_DIR
if is_service_enabled g-graffiti; then
${TOP_DIR}/pkg/elasticsearch.sh download
${TOP_DIR}/pkg/elasticsearch.sh install
fi
} }
# start_glance() - Start running processes, including screen # start_glance() - Start running processes, including screen
@ -321,6 +324,9 @@ function start_glance {
run_process g-reg "$GLANCE_BIN_DIR/glance-registry --config-file=$GLANCE_CONF_DIR/glance-registry.conf" run_process g-reg "$GLANCE_BIN_DIR/glance-registry --config-file=$GLANCE_CONF_DIR/glance-registry.conf"
run_process g-api "$GLANCE_BIN_DIR/glance-api --config-file=$GLANCE_CONF_DIR/glance-api.conf" run_process g-api "$GLANCE_BIN_DIR/glance-api --config-file=$GLANCE_CONF_DIR/glance-api.conf"
if is_service_enabled g-graffiti; then
${TOP_DIR}/pkg/elasticsearch.sh start
fi
echo "Waiting for g-api ($GLANCE_HOSTPORT) to start..." echo "Waiting for g-api ($GLANCE_HOSTPORT) to start..."
if ! wait_for_service $SERVICE_TIMEOUT $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT; then if ! wait_for_service $SERVICE_TIMEOUT $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT; then
die $LINENO "g-api did not start" die $LINENO "g-api did not start"
@ -334,7 +340,6 @@ function stop_glance {
stop_process g-reg stop_process g-reg
} }
# Restore xtrace # Restore xtrace
$XTRACE $XTRACE