Merge "ceilometer: Use new archive policies"

ci/environments/scenario001-multinode-containers.yaml

@@ -105,17 +105,18 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
     # NOTE(sileht): To decrease the time test_telemetry_integration takes We
-    # configure Ceilometer to poll more, We configure the 'high' Gnocchi
-    # archive policy to keep 1 point every 60s. The test will take 2 minutes
-    # instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
-    # in sync with the archive policy, 60s too.
+    # configure Ceilometer to poll more, We configure the
+    # 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s.
+    # The test will take 2 minutes instead of 10 minutes. Note that tempest
+    # telemetry.alarm_granularity must in sync with the archive policy, 60s
+    # too.
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
   ManagePipeline: true
   PipelinePublishers:
-    - gnocchi://?archive_policy=high
+    - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
-    - gnocchi://?archive_policy=high
+    - gnocchi://?archive_policy=ceilometer-high-rate
     - panko://
 
   Debug: true
@@ -154,7 +155,7 @@ parameter_defaults:
   GlanceBackend: rbd
   GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
-  GnocchiArchivePolicy: 'high'
+  GnocchiArchivePolicy: 'ceilometer-high-rate'
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *

ci/environments/scenario002-multinode-containers.yaml

@@ -95,19 +95,20 @@ parameter_defaults:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
     # NOTE(sileht): To decrease the time test_telemetry_integration takes We
-    # configure Ceilometer to poll more, We configure the 'high' Gnocchi
-    # archive policy to keep 1 point every 60s. The test will take 2 minutes
-    # instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
-    # in sync with the archive policy, 60s too.
+    # configure Ceilometer to poll more, We configure the
+    # 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s.
+    # The test will take 2 minutes instead of 10 minutes. Note that tempest
+    # telemetry.alarm_granularity must in sync with the archive policy, 60s
+    # too.
     ceilometer::agent::polling::polling_interval: 15
   ManagePolling: true
   ManagePipeline: true
   PipelinePublishers:
-    - gnocchi://?archive_policy=high
+    - gnocchi://?archive_policy=ceilometer-high-rate
   EventPipelinePublishers:
-    - gnocchi://?archive_policy=high
+    - gnocchi://?archive_policy=ceilometer-high-rate
     - panko://
-  GnocchiArchivePolicy: 'high'
+  GnocchiArchivePolicy: 'ceilometer-high-rate'
   Debug: true
   DockerPuppetDebug: True
   ZaqarMessageStore: 'swift'

puppet/services/ceilometer-base.yaml

@@ -95,7 +95,7 @@ parameters:
     constraints:
       - allowed_values: [ 'messagingv2', 'noop' ]
   GnocchiArchivePolicy:
-    default: 'low'
+    default: 'ceilometer-low-rate'
     type: string
     description: (DEPRECATED) archive policy to use with gnocchi backend
   RpcPort: