Merge "[gnocchi] Disable statsd daemon by default"

ansible/group_vars/all.yml

@@ -566,6 +566,7 @@ enable_etcd: "no"
 enable_fluentd: "yes"
 enable_freezer: "no"
 enable_gnocchi: "no"
+enable_gnocchi_statsd: "no"
 enable_grafana: "no"
 enable_heat: "{{ enable_openstack_core | bool }}"
 enable_horizon: "{{ enable_openstack_core | bool }}"

ansible/roles/gnocchi/defaults/main.yml

@@ -30,7 +30,7 @@ gnocchi_services:
   gnocchi-statsd:
     container_name: gnocchi_statsd
     group: gnocchi-statsd
-    enabled: true
+    enabled: "{{ enable_gnocchi_statsd | bool }}"
     image: "{{ gnocchi_statsd_image_full }}"
     volumes: "{{ gnocchi_statsd_default_volumes + gnocchi_statsd_extra_volumes }}"
     dimensions: "{{ gnocchi_statsd_dimensions }}"

ansible/roles/gnocchi/templates/gnocchi.conf.j2

@@ -27,13 +27,14 @@ max_pool_size = 50
 max_overflow = 1000
 max_retries = -1
 
+{% if enable_gnocchi_statsd | bool %}
 [statsd]
 resource_id = {{ gnocchi_resource_id }}
 user_id = {{ gnocchi_user_id }}
 project_id = {{ gnocchi_project_id }}
 archive_policy_name = low
-
+flush_delay = 10
-flush_delay=10
+{% endif %}
 
 [metricd]
 workers = {{ gnocchi_metricd_workers }}

etc/kolla/globals.yml

@@ -253,6 +253,7 @@
 #enable_fluentd: "yes"
 #enable_freezer: "no"
 #enable_gnocchi: "no"
+#enable_gnocchi_statsd: "no"
 #enable_grafana: "no"
 #enable_heat: "{{ enable_openstack_core | bool }}"
 #enable_horizon: "{{ enable_openstack_core | bool }}"

releasenotes/notes/default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The `gnocchi-statsd <https://gnocchi.osci.io/statsd.html>`__ daemon is
+    no longer enabled by default. If you are using the daemon, you
+    will need to set ``enable_gnocchi_statsd: "yes"`` to continue using
+    it in your deployment.