Skip to content

Commit 00d0da3

Browse files
author
Wayne Okuma
committed
Adds elasticsearch support as a pre-req for the glance-index.
Add elastic search pkg installation and start into the glance install and start paths. Change-Id: I53fc37225dd606f627c9f967083007613eb1f1bb Implements: blueprint catalog-index-service
1 parent 7ec3772 commit 00d0da3

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

files/debs/general

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ libyaml-dev
2727
libffi-dev
2828
libssl-dev # for pyOpenSSL
2929
gettext # used for compiling message catalogs
30+
openjdk-7-jre-headless # NOPRIME

files/rpms/general

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ bc
2626
libyaml-devel
2727
gettext # used for compiling message catalogs
2828
net-tools
29+
java-1.7.0-openjdk-headless # NOPRIME

lib/glance

100644100755
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ GLANCE_REGISTRY_PORT_INT=${GLANCE_REGISTRY_PORT_INT:-19191}
7070
# Tell Tempest this project is present
7171
TEMPEST_SERVICES+=,glance
7272

73-
7473
# Functions
7574
# ---------
7675

@@ -308,6 +307,10 @@ function install_glance {
308307

309308
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
310309
setup_develop $GLANCE_DIR
310+
if is_service_enabled g-graffiti; then
311+
${TOP_DIR}/pkg/elasticsearch.sh download
312+
${TOP_DIR}/pkg/elasticsearch.sh install
313+
fi
311314
}
312315

313316
# start_glance() - Start running processes, including screen
@@ -321,6 +324,9 @@ function start_glance {
321324
run_process g-reg "$GLANCE_BIN_DIR/glance-registry --config-file=$GLANCE_CONF_DIR/glance-registry.conf"
322325
run_process g-api "$GLANCE_BIN_DIR/glance-api --config-file=$GLANCE_CONF_DIR/glance-api.conf"
323326

327+
if is_service_enabled g-graffiti; then
328+
${TOP_DIR}/pkg/elasticsearch.sh start
329+
fi
324330
echo "Waiting for g-api ($GLANCE_HOSTPORT) to start..."
325331
if ! wait_for_service $SERVICE_TIMEOUT $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT; then
326332
die $LINENO "g-api did not start"
@@ -334,7 +340,6 @@ function stop_glance {
334340
stop_process g-reg
335341
}
336342

337-
338343
# Restore xtrace
339344
$XTRACE
340345

0 commit comments

Comments
 (0)