From cbe12eb72eaf70001b80b0a6357cde3048cbc81f Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Tue, 12 May 2015 16:49:49 +0000 Subject: [PATCH] glance: remove deprecated store options glance_store has now been fully migrated, so we can remove these from the config files. Change-Id: I987ab6338b235f0beeed7c7fe74b0f5b6526f70d --- lib/glance | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/glance b/lib/glance index f543e54c7a..4e1bd24ef5 100644 --- a/lib/glance +++ b/lib/glance @@ -138,26 +138,12 @@ function configure_glance { fi # Store specific configs - iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/ - - # NOTE(flaper87): Until Glance is fully migrated, set these configs in both - # sections. iniset $GLANCE_API_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/ iniset $GLANCE_API_CONF DEFAULT workers "$API_WORKERS" # Store the images in swift if enabled. if is_service_enabled s-proxy; then - iniset $GLANCE_API_CONF DEFAULT default_store swift - iniset $GLANCE_API_CONF DEFAULT swift_store_auth_address $KEYSTONE_SERVICE_URI/v2.0/ - iniset $GLANCE_API_CONF DEFAULT swift_store_user $SERVICE_TENANT_NAME:glance-swift - iniset $GLANCE_API_CONF DEFAULT swift_store_key $SERVICE_PASSWORD - iniset $GLANCE_API_CONF DEFAULT swift_store_create_container_on_put True - - iniset $GLANCE_API_CONF DEFAULT known_stores "glance.store.filesystem.Store, glance.store.http.Store, glance.store.swift.Store" - - # NOTE(flaper87): Until Glance is fully migrated, set these configs in both - # sections. iniset $GLANCE_API_CONF glance_store default_store swift iniset $GLANCE_API_CONF glance_store swift_store_auth_address $KEYSTONE_SERVICE_URI/v2.0/ iniset $GLANCE_API_CONF glance_store swift_store_user $SERVICE_TENANT_NAME:glance-swift @@ -211,9 +197,6 @@ function configure_glance { iniset $GLANCE_CACHE_CONF DEFAULT admin_password $SERVICE_PASSWORD # Store specific confs - # NOTE(flaper87): Until Glance is fully migrated, set these configs in both - # sections. - iniset $GLANCE_CACHE_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/ iniset $GLANCE_CACHE_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/ cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON