From 2f1449b04c423861cf79ccfe8a793f71db358943 Mon Sep 17 00:00:00 2001
From: Andrew Bonney <andrew.bonney@bbc.co.uk>
Date: Fri, 11 Nov 2022 10:28:43 +0000
Subject: [PATCH] kibana: fix installation on ubuntu jammy and other py3 only
 systems

Change-Id: I0231b0b00277f306066d4827988f9640d9a1fba7
---
 .../roles/elastic_kibana/vars/redhat.yml      |  2 +-
 .../roles/elastic_kibana/vars/suse.yml        |  2 +-
 .../elastic_kibana/vars/ubuntu-18.04.yml      | 21 +++++++++++++++++++
 .../roles/elastic_kibana/vars/ubuntu.yml      |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 elk_metrics_7x/roles/elastic_kibana/vars/ubuntu-18.04.yml

diff --git a/elk_metrics_7x/roles/elastic_kibana/vars/redhat.yml b/elk_metrics_7x/roles/elastic_kibana/vars/redhat.yml
index 6d5b7c26..d78f03cd 100644
--- a/elk_metrics_7x/roles/elastic_kibana/vars/redhat.yml
+++ b/elk_metrics_7x/roles/elastic_kibana/vars/redhat.yml
@@ -17,4 +17,4 @@ kibana_nginx_vhost_path: /etc/nginx/conf.d/
 kibana_distro_packages:
   - kibana
   - nginx
-  - python-passlib
+  - python3-passlib
diff --git a/elk_metrics_7x/roles/elastic_kibana/vars/suse.yml b/elk_metrics_7x/roles/elastic_kibana/vars/suse.yml
index 761a02bc..3cf72798 100644
--- a/elk_metrics_7x/roles/elastic_kibana/vars/suse.yml
+++ b/elk_metrics_7x/roles/elastic_kibana/vars/suse.yml
@@ -18,4 +18,4 @@ kibana_distro_packages:
   - apache2-utils
   - kibana
   - nginx
-  - python-passlib
+  - python3-passlib
diff --git a/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu-18.04.yml b/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu-18.04.yml
new file mode 100644
index 00000000..193b6e8a
--- /dev/null
+++ b/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu-18.04.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+kibana_nginx_vhost_path: /etc/nginx/sites-available
+kibana_distro_packages:
+  - apache2-utils
+  - kibana
+  - nginx
+  - python-passlib
diff --git a/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu.yml b/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu.yml
index 193b6e8a..4b2e357c 100644
--- a/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu.yml
+++ b/elk_metrics_7x/roles/elastic_kibana/vars/ubuntu.yml
@@ -18,4 +18,4 @@ kibana_distro_packages:
   - apache2-utils
   - kibana
   - nginx
-  - python-passlib
+  - python3-passlib