From 0920e7ae472496a075994696be66419b8bb701cc Mon Sep 17 00:00:00 2001
From: David Kirwan <davidkirwanirl@gmail.com>
Date: Thu, 21 Sep 2023 08:33:42 +0100
Subject: [PATCH] zabbix: Update db creation task to continue when db exists

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>
---
 .../zabbix_server/tasks/create_keytab.yml     | 21 +++++++++++++++++++
 roles/zabbix/zabbix_server/tasks/db.yml       |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 roles/zabbix/zabbix_server/tasks/create_keytab.yml

diff --git a/roles/zabbix/zabbix_server/tasks/create_keytab.yml b/roles/zabbix/zabbix_server/tasks/create_keytab.yml
new file mode 100644
index 0000000000..8d88d1824e
--- /dev/null
+++ b/roles/zabbix/zabbix_server/tasks/create_keytab.yml
@@ -0,0 +1,21 @@
+- name: Create the zabbix keytab path
+  file:
+    path: "/etc/openshift_apps/zabbix/"
+    state: directory
+    owner: root
+    group: root
+    mode: 0750
+  tags:
+    - create-keytab
+
+
+- name: Acquire a keytab
+  include_role:
+    name: keytab/service
+  vars:
+    kt_location:
+      "/etc/openshift_apps/zabbix/zabbix_server.kt"
+    service: "zabbix"
+    host: "{{ communishift_ocp_api_hostname }}"
+  tags:
+    - create-keytab
diff --git a/roles/zabbix/zabbix_server/tasks/db.yml b/roles/zabbix/zabbix_server/tasks/db.yml
index ab440b3d0c..4c699c92c4 100644
--- a/roles/zabbix/zabbix_server/tasks/db.yml
+++ b/roles/zabbix/zabbix_server/tasks/db.yml
@@ -29,6 +29,7 @@
 
 - name: Configure the zabbix db
   ansible.builtin.shell: "sudo -u postgres createdb -O {{ zabbix_db_user }} {{ zabbix_db_name }}"
+  ignore_errors: True
   tags:
     - db-configure