diff options
| author | Julien Danjou <julien@danjou.info> | 2018-08-21 15:57:11 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2018-08-31 13:29:51 +0200 |
| commit | 80239e48ea69b944b4bbf459eddda20cc5dc1450 (patch) | |
| tree | 34daf2cbf88f17bf77dc625189e4b1060171bd85 | |
| parent | 77832c1f385e7b2b111d599dbbd5c12ade384d38 (diff) | |
| download | ceilometer-80239e48ea69b944b4bbf459eddda20cc5dc1450.tar.gz | |
gnocchi: use ceilometer-low as default archive policy
Otherwise it's never used, at all.
Change-Id: I68c29a9f9312300474d5e5e9c6944ce617bc1e3a
| -rw-r--r-- | ceilometer/publisher/gnocchi.py | 3 | ||||
| -rw-r--r-- | devstack/settings | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 289dc338..4f928c58 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -252,7 +252,8 @@ class GnocchiPublisher(publisher.ConfigPublisherBase): pkg_resources.resource_filename(__name__, "data/gnocchi_resources.yaml")) - archive_policy_default = data.get("archive_policy_default", "low") + archive_policy_default = data.get("archive_policy_default", + "ceilometer-low") resource_defs = [] for resource in data.get('resources', []): try: diff --git a/devstack/settings b/devstack/settings index c4fed7db..410ed8ea 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,7 +19,7 @@ fi # Gnocchi default archive_policy for Ceilometer # TODO(sileht): when Gnocchi 4.0 is out use the tarball instead GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi#egg=gnocchi} -GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low} +GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-ceilometer-low} GNOCCHI_CONF_DIR=${GNOCCHI_CONF_DIR:-/etc/gnocchi} GNOCCHI_CONF=${GNOCCHI_CONF:-${GNOCCHI_CONF_DIR}/gnocchi.conf} GNOCCHI_COORDINATOR_URL=${CEILOMETER_COORDINATOR_URL:-redis://localhost:6379} |