From 1769a49115e7ea2a35f230c0412351ad8dd2f05d Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 23 May 2023 16:21:17 +0200
Subject: [PATCH] opensearch: alter path after using rpm/deb packaging

opensearch-dashboards now use a dedicated user

Depends-On: https://review.opendev.org/c/openstack/kolla/+/883941
Change-Id: I6908f52f824a97a5a4a2bead92b7b2e5cdebdb9f
---
 .../templates/opensearch-dashboards.json.j2        | 14 +++++++-------
 .../roles/opensearch/templates/opensearch.json.j2  |  2 +-
 .../templates/opensearch_dashboards.yml.j2         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/opensearch/templates/opensearch-dashboards.json.j2 b/ansible/roles/opensearch/templates/opensearch-dashboards.json.j2
index 08cddf33f3..5740561a83 100644
--- a/ansible/roles/opensearch/templates/opensearch-dashboards.json.j2
+++ b/ansible/roles/opensearch/templates/opensearch-dashboards.json.j2
@@ -1,22 +1,22 @@
 {
-    "command": "/usr/share/opensearch-dashboards/bin/opensearch-dashboards --config /etc/opensearch/opensearch_dashboards.yml",
+    "command": "/usr/share/opensearch-dashboards/bin/opensearch-dashboards --config /etc/opensearch-dashboards/opensearch_dashboards.yml",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/opensearch_dashboards.yml",
-            "dest": "/etc/opensearch/opensearch_dashboards.yml",
-            "owner": "opensearch",
+            "dest": "/etc/opensearch-dashboards/opensearch_dashboards.yml",
+            "owner": "opensearch-dashboards",
             "perm": "0640"
         }
     ],
     "permissions": [
         {
-            "path": "/var/log/kolla/opensearch",
-            "owner": "opensearch:opensearch",
+            "path": "/var/log/kolla/opensearch-dashboards",
+            "owner": "opensearch-dashboards:opensearch-dashboards",
             "recurse": true
         },
         {
-            "path": "/usr/share/opensearch/dashboards/optimize/bundles",
-            "owner": "opensearch:opensearch",
+            "path": "/usr/share/opensearch-dashboards/optimize/bundles",
+            "owner": "opensearch-dashboards:opensearch-dashboards",
             "recurse": true
         }
     ]
diff --git a/ansible/roles/opensearch/templates/opensearch.json.j2 b/ansible/roles/opensearch/templates/opensearch.json.j2
index 2228f29403..71fa6581e9 100644
--- a/ansible/roles/opensearch/templates/opensearch.json.j2
+++ b/ansible/roles/opensearch/templates/opensearch.json.j2
@@ -3,7 +3,7 @@
     "config_files": [
         {
             "source": "{{ container_config_directory }}/opensearch.yml",
-            "dest": "/usr/share/opensearch/config/opensearch.yml",
+            "dest": "/etc/opensearch/opensearch.yml",
             "owner": "opensearch",
             "perm": "0600"
         }
diff --git a/ansible/roles/opensearch/templates/opensearch_dashboards.yml.j2 b/ansible/roles/opensearch/templates/opensearch_dashboards.yml.j2
index b9c20aa40e..ca2f04886e 100644
--- a/ansible/roles/opensearch/templates/opensearch_dashboards.yml.j2
+++ b/ansible/roles/opensearch/templates/opensearch_dashboards.yml.j2
@@ -1,5 +1,5 @@
 opensearchDashboards.defaultAppId: "{{ opensearch_dashboards_default_app_id }}"
-logging.dest: /var/log/kolla/opensearch/opensearch-dashboards.log
+logging.dest: /var/log/kolla/opensearch-dashboards/opensearch-dashboards.log
 server.port: {{ opensearch_dashboards_port }}
 server.host: "{{ api_interface_address }}"
 opensearch.hosts: "{{ opensearch_internal_endpoint }}"