diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f03c3d9930..410ca2d1f2 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -283,8 +283,6 @@ function configure_ceilometer { iniset $CEILOMETER_CONF service_credentials region_name $REGION_NAME iniset $CEILOMETER_CONF service_credentials auth_url $KEYSTONE_SERVICE_URI - configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR - if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP" @@ -302,9 +300,8 @@ function configure_ceilometer { # init_ceilometer() - Initialize etc. function init_ceilometer { - # Create cache dir - sudo install -d -o $STACK_USER $CEILOMETER_AUTH_CACHE_DIR - rm -f $CEILOMETER_AUTH_CACHE_DIR/* + # Nothing to do + : } # Install Ceilometer. diff --git a/devstack/settings b/devstack/settings index f02b69fa4e..6cca1a59dd 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,8 +8,6 @@ enable_service ceilometer-anotification CEILOMETER_DIR=$DEST/ceilometer CEILOMETER_CONF_DIR=/etc/ceilometer CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf -CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer} -CEILOMETER_WSGI_DIR=${CEILOMETER_WSGI_DIR:-/var/www/ceilometer} # Gnocchi is the default backind if both "CEILOMETER_BACKEND" # and "CEILOMETER_BACKENDS" are empty