From c275b2075b6937026a262e8f5d491922a651d176 Mon Sep 17 00:00:00 2001
From: Mateusz Szostok <mateusz@structsure.co>
Date: Mon, 15 Feb 2021 14:22:54 +0100
Subject: [PATCH] Fix Jira install manifests, revert pass generation

---
 och-content/implementation/atlassian/jira/install.yaml     | 3 +++
 och-content/implementation/bitnami/postgresql/install.yaml | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/och-content/implementation/atlassian/jira/install.yaml b/och-content/implementation/atlassian/jira/install.yaml
index 8cf643158..1a76bcaec 100644
--- a/och-content/implementation/atlassian/jira/install.yaml
+++ b/och-content/implementation/atlassian/jira/install.yaml
@@ -65,6 +65,8 @@ spec:
       methods:
         - name: install
           revision: 0.1.0
+        - name: create-db
+          revision: 0.1.0
     - interfaceGroupPath: cap.interface.templating.jinja2
       alias: jinja2
       methods:
@@ -93,6 +95,7 @@ spec:
                           data: |
                             superuser:
                               username: superuser
+                              password: okon
                             defaultDBName: postgres
 
               - - name: create-db
diff --git a/och-content/implementation/bitnami/postgresql/install.yaml b/och-content/implementation/bitnami/postgresql/install.yaml
index 4b3930967..ab3f562f4 100644
--- a/och-content/implementation/bitnami/postgresql/install.yaml
+++ b/och-content/implementation/bitnami/postgresql/install.yaml
@@ -87,9 +87,7 @@ spec:
                                 pullPolicy: Always
                               postgresqlDatabase: {{ defaultDBName }}
                               postgresqlUsername: {{ superuser.username }}
-                              {% if superuser.password is defined %}
                               postgresqlPassword: {{ superuser.password }}
-                              {% endif %}
                             output:{% raw %}
                               goTemplate:
                                 host: '{{ template "common.names.fullname" . }}'