From 57365000304cc1d610a8a97dfd61ddb3e854fdcf Mon Sep 17 00:00:00 2001 From: Jason Anderson Date: Thu, 20 Jun 2019 11:55:02 -0500 Subject: [PATCH] [gnocchi] Disable statsd daemon by default This daemon is an additional piece of functionality supported by Gnocchi and the general pattern in KA is to disable such things unless the user explicitly wants them. This also helps avoid having to set the resource_id, user_id, and project_id variables for Gnocchi if you don't care about this daemon. Change-Id: I5f14cee4b0bb0d781b1ff53200d11de972d20c82 --- ansible/group_vars/all.yml | 1 + ansible/roles/gnocchi/defaults/main.yml | 2 +- ansible/roles/gnocchi/templates/gnocchi.conf.j2 | 5 +++-- etc/kolla/globals.yml | 1 + .../default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml | 7 +++++++ 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index c450688329..a128ebadbb 100644 --- a/ansible/group_vars/all.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml index 2f8f026003..fb4c132691 100644 --- a/ansible/roles/gnocchi/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/gnocchi.conf.j2 index 4856185752..3be0e95763 100644 --- a/ansible/roles/gnocchi/templates/gnocchi.conf.j2 +++ b/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 }} diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 1f190866cb..99050042b2 100644 --- a/etc/kolla/globals.yml +++ b/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 }}" diff --git a/releasenotes/notes/default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml b/releasenotes/notes/default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml new file mode 100644 index 0000000000..da8cca34a9 --- /dev/null +++ b/releasenotes/notes/default-disable-gnocchi-statsd-f7aa933f342ce2b0.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + The `gnocchi-statsd `__ 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.