openstack/devstack
Code Issues Proposed changes

Remove deprecated references to g-search

Browse Source 
Commit 020586fab4 removed support
for g-search as it was promoted to its own project. The devstack
plugin for Searchlight triggers the installation of elasticsearch,
so it can be removed from upstream devstack.

Change-Id: Iada75fc59c66b776c506431f93deb668ab0a84b9
This commit is contained in:
Sylvain Baubeau 2016-04-26 20:39:18 +02:00
parent 96ffde28b6
commit 7fa0efffab
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/glance
View File

@ -362,11 +362,6 @@ function install_glance {
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
if is_service_enabled g-search; then
${TOP_DIR}/pkg/elasticsearch.sh download
${TOP_DIR}/pkg/elasticsearch.sh install
fi
setup_develop $GLANCE_DIR setup_develop $GLANCE_DIR
} }
@ -386,7 +381,7 @@ function start_glance {
die $LINENO "g-api did not start" die $LINENO "g-api did not start"
fi fi
#Start g-glare after g-reg/g-api/g-search #Start g-glare after g-reg/g-api
if is_service_enabled g-glare; then if is_service_enabled g-glare; then
run_process g-glare "$GLANCE_BIN_DIR/glance-glare --config-file=$GLANCE_CONF_DIR/glance-glare.conf" run_process g-glare "$GLANCE_BIN_DIR/glance-glare --config-file=$GLANCE_CONF_DIR/glance-glare.conf"
echo "Waiting for Glare [g-glare] ($GLANCE_GLARE_HOSTPORT) to start..." echo "Waiting for Glare [g-glare] ($GLANCE_GLARE_HOSTPORT) to start..."