Browse code

Merge "Remove deprecated references to g-search"

Jenkins authored on 2016/05/04 08:08:40
Showing 1 changed files
... ...
@@ -362,11 +362,6 @@ function install_glance {
362 362
 
363 363
     git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
364 364
 
365
-    if is_service_enabled g-search; then
366
-        ${TOP_DIR}/pkg/elasticsearch.sh download
367
-        ${TOP_DIR}/pkg/elasticsearch.sh install
368
-    fi
369
-
370 365
     setup_develop $GLANCE_DIR
371 366
 }
372 367
 
... ...
@@ -386,7 +381,7 @@ function start_glance {
386 386
         die $LINENO "g-api did not start"
387 387
     fi
388 388
 
389
-    #Start g-glare after g-reg/g-api/g-search
389
+    #Start g-glare after g-reg/g-api
390 390
     if is_service_enabled g-glare; then
391 391
         run_process g-glare "$GLANCE_BIN_DIR/glance-glare --config-file=$GLANCE_CONF_DIR/glance-glare.conf"
392 392
         echo "Waiting for Glare [g-glare] ($GLANCE_GLARE_HOSTPORT) to start..."