openstack/gnocchi
Code Issues Proposed changes

Merge "devstack: remove Ceilometer support"

Browse Source
This commit is contained in:
Jenkins 2016-01-20 22:17:13 +00:00 committed by Gerrit Code Review
commit 57ac881e06
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/plugin.sh
View File

@ -18,7 +18,6 @@
# - ``SERVICE_{TENANT_NAME|PASSWORD}`` must be defined
# - ``SERVICE_HOST``
# - ``OS_AUTH_URL``, ``KEYSTONE_SERVICE_URI`` for auth in api
# - ``CEILOMETER_CONF`` for ceilometer dispatcher configuration
# stack.sh
# ---------
@ -302,19 +301,6 @@ function configure_ceph_gnocchi {
sudo chown ${STACK_USER}:$(id -g -n $whoami) ${CEPH_CONF_DIR}/ceph.client.${GNOCCHI_CEPH_USER}.keyring
}
function configure_ceilometer_gnocchi {
gnocchi_url=$(gnocchi_service_url)
iniset $CEILOMETER_CONF DEFAULT meter_dispatchers gnocchi
iniset $CEILOMETER_CONF alarms gnocchi_url $gnocchi_url
iniset $CEILOMETER_CONF dispatcher_gnocchi url $gnocchi_url
iniset $CEILOMETER_CONF dispatcher_gnocchi archive_policy ${GNOCCHI_ARCHIVE_POLICY}
if is_service_enabled swift && [[ "$GNOCCHI_STORAGE_BACKEND" = 'swift' ]] ; then
iniset $CEILOMETER_CONF dispatcher_gnocchi filter_service_activity "True"
iniset $CEILOMETER_CONF dispatcher_gnocchi filter_project "gnocchi_swift"
else
iniset $CEILOMETER_CONF dispatcher_gnocchi filter_service_activity "False"
fi
}
# init_gnocchi() - Initialize etc.
function init_gnocchi {
@ -450,10 +436,6 @@ if is_service_enabled gnocchi-api; then
echo_summary "Configuring Gnocchi"
configure_gnocchi
create_gnocchi_accounts
if is_service_enabled ceilometer; then
echo_summary "Configuring Ceilometer for gnocchi"
configure_ceilometer_gnocchi
fi
if is_service_enabled ceph && [[ "$GNOCCHI_STORAGE_BACKEND" = 'ceph' ]] ; then
echo_summary "Configuring Gnocchi for Ceph"
configure_ceph_gnocchi

3
devstack/settings
View File

@ -32,9 +32,6 @@ GNOCCHI_SERVICE_PORT=${GNOCCHI_SERVICE_PORT:-8041}
GNOCCHI_SERVICE_PREFIX=${GNOCCHI_SERVICE_PREFIX:-'/metric'}
GNOCCHI_SERVICE_HOST=$SERVICE_HOST
# Gnocchi ceilometer default archive_policy
GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low}
# Gnocchi statsd info
GNOCCHI_STATSD_RESOURCE_ID=${GNOCCHI_STATSD_RESOURCE_ID:-$(uuidgen)}
GNOCCHI_STATSD_USER_ID=${GNOCCHI_STATSD_USER_ID:-$(uuidgen)}