Revert "devstack config for dogpile cache"
This reverts commit 5bcd6469d3
.
i think this is making the gate fail quite hard. let's temporarily revert it.
Change-Id: I3fc8d4e9f79f2fde4fbc3b6b82e349f670926965
This commit is contained in:
parent
5bcd6469d3
commit
a0bb0f16b1
|
@ -128,7 +128,7 @@ function _ceilometer_config_apache_wsgi {
|
|||
function _ceilometer_prepare_coordination {
|
||||
if echo $CEILOMETER_COORDINATION_URL | grep -q '^memcached:'; then
|
||||
install_package memcached
|
||||
elif [[ "${CEILOMETER_COORDINATOR_URL%%:*}" == "redis" || "${CEILOMETER_CACHE_BACKEND##*.}" == "redis" ]]; then
|
||||
elif echo $CEILOMETER_COORDINATION_URL | grep -q '^redis:'; then
|
||||
_ceilometer_install_redis
|
||||
fi
|
||||
}
|
||||
|
@ -210,20 +210,6 @@ function cleanup_ceilometer {
|
|||
fi
|
||||
}
|
||||
|
||||
# Set configuraiton for cache backend.
|
||||
# NOTE(cdent): This currently only works for redis. Still working
|
||||
# out how to express the other backends.
|
||||
function _ceilometer_configure_cache_backend {
|
||||
iniset $CEILOMETER_CONF cache backend $CEILOMETER_CACHE_BACKEND
|
||||
iniset $CEILOMETER_CONF cache backend_argument url:$CEILOMETER_CACHE_URL
|
||||
iniadd_literal $CEILOMETER_CONF cache backend_argument distributed_lock:True
|
||||
if [[ "${CEILOMETER_CACHE_BACKEND##*.}" == "redis" ]]; then
|
||||
iniadd_literal $CEILOMETER_CONF cache backend_argument db:0
|
||||
iniadd_literal $CEILOMETER_CONF cache backend_argument redis_expiration_time:600
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Set configuration for storage backend.
|
||||
function _ceilometer_configure_storage_backend {
|
||||
if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
|
||||
|
@ -262,10 +248,6 @@ function configure_ceilometer {
|
|||
iniset $CEILOMETER_CONF compute workload_partitioning True
|
||||
fi
|
||||
|
||||
if [[ -n "$CEILOMETER_CACHE_BACKEND" ]]; then
|
||||
_ceilometer_configure_cache_backend
|
||||
fi
|
||||
|
||||
# Install the policy file and declarative configuration files to
|
||||
# the conf dir.
|
||||
# NOTE(cdent): Do not make this a glob as it will conflict
|
||||
|
|
|
@ -34,11 +34,6 @@ CEILOMETER_EVENTS=${CEILOMETER_EVENTS:-True}
|
|||
CEILOMETER_COORDINATION_URL=${CEILOMETER_COORDINATION_URL:-}
|
||||
CEILOMETER_PIPELINE_INTERVAL=${CEILOMETER_PIPELINE_INTERVAL:-}
|
||||
|
||||
# Cache Options
|
||||
# NOTE(cdent): These are incomplete and specific for this testing.
|
||||
CEILOMETER_CACHE_BACKEND=${CEILOMETER_CACHE_BACKEND:-dogpile.cache.redis}
|
||||
CEILOMETER_CACHE_URL=${CEILOMETER_CACHE_URL:-redis://localhost:6379}
|
||||
|
||||
CEILOMETER_EVENT_ALARM=${CEILOMETER_EVENT_ALARM:-False}
|
||||
|
||||
# Tell Tempest this project is present
|
||||
|
|
Loading…
Reference in New Issue