openstack/ceilometer
Code Issues Proposed changes

Merge "Drop authtoken middleware options from ceilometer config file"

Browse Source
This commit is contained in:
Zuul 2024-01-08 05:22:04 +00:00 committed by Gerrit Code Review
commit ac4fc17f40
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -283,8 +283,6 @@ function configure_ceilometer {
iniset $CEILOMETER_CONF service_credentials region_name $REGION_NAME iniset $CEILOMETER_CONF service_credentials region_name $REGION_NAME
iniset $CEILOMETER_CONF service_credentials auth_url $KEYSTONE_SERVICE_URI 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 if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere
iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP" iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP"
@ -302,9 +300,8 @@ function configure_ceilometer {
# init_ceilometer() - Initialize etc. # init_ceilometer() - Initialize etc.
function init_ceilometer { function init_ceilometer {
# Create cache dir # Nothing to do
sudo install -d -o $STACK_USER $CEILOMETER_AUTH_CACHE_DIR :
rm -f $CEILOMETER_AUTH_CACHE_DIR/*
} }
# Install Ceilometer. # Install Ceilometer.

2
devstack/settings
View File

@ -8,8 +8,6 @@ enable_service ceilometer-anotification
CEILOMETER_DIR=$DEST/ceilometer CEILOMETER_DIR=$DEST/ceilometer
CEILOMETER_CONF_DIR=/etc/ceilometer CEILOMETER_CONF_DIR=/etc/ceilometer
CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf 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" # Gnocchi is the default backind if both "CEILOMETER_BACKEND"
# and "CEILOMETER_BACKENDS" are empty # and "CEILOMETER_BACKENDS" are empty