openstack
/
ceilometer
Code Issues Proposed changes

Merge "devstack: Use spaces instead of tabs"

This commit is contained in:
Zuul 2024-01-29 05:54:03 +00:00 committed by Gerrit Code Review
parent 323a4cbf8c 5f1b0c8aed
commit 01bdcd8587
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
devstack/plugin.sh
View File

@ -213,23 +213,23 @@ function _ceilometer_configure_storage_backend {
if [ $(echo "$CEILOMETER_BACKENDS" | tr -d ",") = 'none' ] ; then
echo_summary "All Ceilometer backends seems disabled, set \$CEILOMETER_BACKENDS to select one."
else
head -n -1 $CEILOMETER_CONF_DIR/pipeline.yaml > $CEILOMETER_CONF_DIR/tmp ; mv $CEILOMETER_CONF_DIR/tmp $CEILOMETER_CONF_DIR/pipeline.yaml
head -n -1 $CEILOMETER_CONF_DIR/event_pipeline.yaml > $CEILOMETER_CONF_DIR/tmp ; mv $CEILOMETER_CONF_DIR/tmp $CEILOMETER_CONF_DIR/event_pipeline.yaml
head -n -1 $CEILOMETER_CONF_DIR/pipeline.yaml > $CEILOMETER_CONF_DIR/tmp ; mv $CEILOMETER_CONF_DIR/tmp $CEILOMETER_CONF_DIR/pipeline.yaml
head -n -1 $CEILOMETER_CONF_DIR/event_pipeline.yaml > $CEILOMETER_CONF_DIR/tmp ; mv $CEILOMETER_CONF_DIR/tmp $CEILOMETER_CONF_DIR/event_pipeline.yaml
BACKENDS=$(echo $CEILOMETER_BACKENDS | tr "," "\n")
for CEILOMETER_BACKEND in ${BACKENDS[@]}
do
if [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
echo " - gnocchi://?archive_policy=${GNOCCHI_ARCHIVE_POLICY}&filter_project=service" >> $CEILOMETER_CONF_DIR/event_pipeline.yaml
echo " - gnocchi://?archive_policy=${GNOCCHI_ARCHIVE_POLICY}&filter_project=service" >> $CEILOMETER_CONF_DIR/pipeline.yaml
! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && configure_gnocchi
elif [ "$CEILOMETER_BACKEND" = 'sg-core' ] ; then
echo " - tcp://127.0.0.1:4242" >> $CEILOMETER_CONF_DIR/event_pipeline.yaml
echo " - tcp://127.0.0.1:4242" >> $CEILOMETER_CONF_DIR/pipeline.yaml
else
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
fi
done
BACKENDS=$(echo $CEILOMETER_BACKENDS | tr "," "\n")
for CEILOMETER_BACKEND in ${BACKENDS[@]}
do
if [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
echo " - gnocchi://?archive_policy=${GNOCCHI_ARCHIVE_POLICY}&filter_project=service" >> $CEILOMETER_CONF_DIR/event_pipeline.yaml
echo " - gnocchi://?archive_policy=${GNOCCHI_ARCHIVE_POLICY}&filter_project=service" >> $CEILOMETER_CONF_DIR/pipeline.yaml
! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && configure_gnocchi
elif [ "$CEILOMETER_BACKEND" = 'sg-core' ] ; then
echo " - tcp://127.0.0.1:4242" >> $CEILOMETER_CONF_DIR/event_pipeline.yaml
echo " - tcp://127.0.0.1:4242" >> $CEILOMETER_CONF_DIR/pipeline.yaml
else
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
fi
done
fi
}
@ -321,7 +321,7 @@ function install_ceilometer {
fi
if [[ "$CEILOMETER_BACKENDS" =~ 'gnocchi' ]]; then
extra=gnocchi
extra=gnocchi
fi
setup_develop $CEILOMETER_DIR $extra
sudo install -d -o $STACK_USER -m 755 $CEILOMETER_CONF_DIR