From 295f8d1b43cf2003f66634389fc0615609ee0f86 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 1 Sep 2020 14:15:52 +0200
Subject: [PATCH] Remove unused configuration for prometheus-openstack-exporter

The Prometheus OpenStack exporter was needlessly configured to use the
prometheus Docker volume and change permissions of /data, which does
not exist in the container image.

This must have been copy-pasted from existing Prometheus code.

Change-Id: I96017c17e68ca7a00a2d5ac41f2f43ef87694514
---
 ansible/roles/prometheus/defaults/main.yml                   | 1 -
 .../templates/prometheus-openstack-exporter.json.j2          | 5 -----
 ...heus-volume-from-openstack-exporter-f6bb5da3093abef8.yaml | 5 +++++
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/remove-prometheus-volume-from-openstack-exporter-f6bb5da3093abef8.yaml

diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml
index 3cd8ac0543..720a6fdd7b 100644
--- a/ansible/roles/prometheus/defaults/main.yml
+++ b/ansible/roles/prometheus/defaults/main.yml
@@ -221,7 +221,6 @@ prometheus_openstack_exporter_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "prometheus:/var/lib/prometheus"
 prometheus_elasticsearch_exporter_default_volumes:
   - "{{ node_config_directory }}/prometheus-elasticsearch-exporter/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
diff --git a/ansible/roles/prometheus/templates/prometheus-openstack-exporter.json.j2 b/ansible/roles/prometheus/templates/prometheus-openstack-exporter.json.j2
index 6a65ee802a..60d9e5fd3b 100644
--- a/ansible/roles/prometheus/templates/prometheus-openstack-exporter.json.j2
+++ b/ansible/roles/prometheus/templates/prometheus-openstack-exporter.json.j2
@@ -9,11 +9,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/data",
-            "owner": "prometheus:kolla",
-            "recurse": true
-        },
         {
             "path": "/var/log/kolla/prometheus",
             "owner": "prometheus:kolla",
diff --git a/releasenotes/notes/remove-prometheus-volume-from-openstack-exporter-f6bb5da3093abef8.yaml b/releasenotes/notes/remove-prometheus-volume-from-openstack-exporter-f6bb5da3093abef8.yaml
new file mode 100644
index 0000000000..2976ec3530
--- /dev/null
+++ b/releasenotes/notes/remove-prometheus-volume-from-openstack-exporter-f6bb5da3093abef8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    No longer configures the Prometheus OpenStack exporter to use the
+    ``prometheus`` Docker volume, which was never required.