From 43ec7637cfb08e1f6b91df942ab815f52db6ff06 Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Mon, 28 Nov 2016 16:49:40 +0000
Subject: [PATCH] cleanup gnocchiclient

we don't support url for since mitaka. it is discovered via keystone

Change-Id: Ic7ef35bf208e2a8a1c8fe3c54f8c23abd0c5c50e
---
 ceilometer/dispatcher/gnocchi.py | 1 -
 ceilometer/gnocchi_client.py     | 7 -------
 devstack/plugin.sh               | 2 --
 3 files changed, 10 deletions(-)

diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py
index 89849da36c..1a7793897e 100644
--- a/ceilometer/dispatcher/gnocchi.py
+++ b/ceilometer/dispatcher/gnocchi.py
@@ -171,7 +171,6 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase,
     look like the following:
 
     [dispatcher_gnocchi]
-    url = http://localhost:8041
     archive_policy = low
 
     To enable this dispatcher, the following section needs to be present in
diff --git a/ceilometer/gnocchi_client.py b/ceilometer/gnocchi_client.py
index 5703419f89..e67ccf43db 100644
--- a/ceilometer/gnocchi_client.py
+++ b/ceilometer/gnocchi_client.py
@@ -13,19 +13,12 @@
 
 from gnocchiclient import client
 from gnocchiclient import exceptions as gnocchi_exc
-from oslo_config import cfg
 from oslo_log import log
 
 from ceilometer import keystone_client
 
 LOG = log.getLogger(__name__)
 
-OPTS = [
-    cfg.StrOpt('url',
-               deprecated_for_removal=True,
-               help='URL to Gnocchi. default: autodetection'),
-]
-
 
 def get_gnocchiclient(conf, endpoint_override=None):
     session = keystone_client.get_session(conf)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 889ea86975..e073e85a46 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -251,7 +251,6 @@ function _ceilometer_configure_storage_backend {
         iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer
         iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer
     elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
-        gnocchi_url=$(gnocchi_service_url)
         iniset $CEILOMETER_CONF DEFAULT meter_dispatchers gnocchi
         iniset $CEILOMETER_CONF DEFAULT event_dispatchers gnocchi
         # NOTE(gordc): set higher retry in case gnocchi is started after ceilometer on a slow machine
@@ -259,7 +258,6 @@ function _ceilometer_configure_storage_backend {
         # NOTE(gordc): set batching to better handle recording on a slow machine
         iniset $CEILOMETER_CONF collector batch_size 50
         iniset $CEILOMETER_CONF collector batch_timeout 5
-        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"