commit e910157da6db2383b3499a30a9b90e54dc12e682
author sgarbuz <sgarbuz@mirantis.com> Mon Feb 25 11:08:25 2019 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Tue Feb 26 13:53:22 2019 +0000
tree 750b9bbef79ed9883a1d1e95721032e1a166a7a1
parent fc497e53e3d862d136d09e183bec26274354a152

Add soft param ceilometer_gnocchi_archive_policy

Add soft param ceilometer_gnocchi_archive_policy=default
and move it to system.defaults.openstack

Change-Id: I7b813ccb0bf71842b68f6a9d69382c2a06111f92
Related-Prod: PROD-23721 (PROD:23721)

ceilometer/server/backend/gnocchi.yml

diff --git a/ceilometer/server/backend/gnocchi.yml b/ceilometer/server/backend/gnocchi.yml
index 6ebf45f..d9f40fb 100644
--- a/ceilometer/server/backend/gnocchi.yml
+++ b/ceilometer/server/backend/gnocchi.yml
@@ -12,7 +12,7 @@
       publisher:
         gnocchi:
           enabled: true
-          url: "gnocchi://?filter_project=${_param:ceilometer_gnocchi_filter_project}"
+          url: "gnocchi://?filter_project=${_param:ceilometer_gnocchi_filter_project}&${_param:ceilometer_gnocchi_archive_policy}"
           publish_metric: true
           # filter_project is deprecated since queens
           filter_project: ${_param:ceilometer_gnocchi_filter_project}

defaults/openstack/init.yml

diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index f9b189e..75bb601 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -65,6 +65,7 @@
     ceilometer_old_version: ${_param:openstack_old_version}
     ceilometer_version: ${_param:openstack_version}
     ceilometer_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+    ceilometer_gnocchi_archive_policy: default
     # Gnocchi
     gnocchi_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
     gnocchi_memcache_secret_key: ''