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
diff --git a/lib/glance b/lib/glance
old mode 100644
new mode 100755
index 0340c21..c5206d4
--- a/lib/glance
+++ b/lib/glance
@@ -70,7 +70,6 @@
# Tell Tempest this project is present
TEMPEST_SERVICES+=,glance
-
# Functions
# ---------
@@ -308,6 +307,10 @@
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
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
@@ -321,6 +324,9 @@
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"
+ if is_service_enabled g-graffiti; then
+ ${TOP_DIR}/pkg/elasticsearch.sh start
+ fi
echo "Waiting for g-api ($GLANCE_HOSTPORT) to start..."
if ! wait_for_service $SERVICE_TIMEOUT $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT; then
die $LINENO "g-api did not start"
@@ -334,7 +340,6 @@
stop_process g-reg
}
-
# Restore xtrace
$XTRACE