From ebe95d18756f1e35a0e36c18078a07b823b861f0 Mon Sep 17 00:00:00 2001
From: Nishant Kumar <nk613n@att.com>
Date: Mon, 4 Feb 2019 04:56:51 +0000
Subject: [PATCH] Use helm toolkit for DB initialization

Depends-On: https://review.openstack.org/#/c/635348/

Change-Id: I55fa7a08b919581552dd512316fc42581762a6a4
---
 charts/drydock/templates/bin/_db-init.sh.tpl  | 43 -------------------
 charts/drydock/templates/configmap-bin.yaml   |  2 +-
 .../templates/job-drydock-db-init.yaml        |  8 ++--
 tools/helm_tk.sh                              |  2 +-
 4 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 charts/drydock/templates/bin/_db-init.sh.tpl

diff --git a/charts/drydock/templates/bin/_db-init.sh.tpl b/charts/drydock/templates/bin/_db-init.sh.tpl
deleted file mode 100644
index f48d0437..00000000
--- a/charts/drydock/templates/bin/_db-init.sh.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-{{/*
-Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
-
-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.
-*/}}
-
-set -ex
-export HOME=/tmp
-
-pgsql_superuser_cmd () {
-  DB_COMMAND="$1"
-  if [[ ! -z $2 ]]; then
-      EXPORT PGDATABASE=$2
-  fi
-
-  psql \
-  -h $DB_FQDN \
-  -p $DB_PORT \
-  -U ${DB_ADMIN_USER} \
-  --command="${DB_COMMAND}"
-}
-
-# Create db
-pgsql_superuser_cmd "SELECT 1 FROM pg_database WHERE datname = '$DB_NAME';" | grep -q 1 || pgsql_superuser_cmd "CREATE DATABASE $DB_NAME;"
-
-# Create db user
-pgsql_superuser_cmd "SELECT * FROM pg_roles WHERE rolname = '$DB_SERVICE_USER';" | tail -n +3 | head -n -2 | grep -q 1 || \
-    pgsql_superuser_cmd "CREATE ROLE ${DB_SERVICE_USER} LOGIN PASSWORD '$DB_SERVICE_PASSWORD';"
-
-# Grant permissions to user
-pgsql_superuser_cmd "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME to $DB_SERVICE_USER;"
diff --git a/charts/drydock/templates/configmap-bin.yaml b/charts/drydock/templates/configmap-bin.yaml
index c7b52934..c6b1f746 100755
--- a/charts/drydock/templates/configmap-bin.yaml
+++ b/charts/drydock/templates/configmap-bin.yaml
@@ -29,7 +29,7 @@ data:
   ks-domain-user.sh: |
 {{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
   db-init.sh: |+
-{{ tuple "bin/_db-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+{{- include "helm-toolkit.scripts.pg_db_init" . | indent 4 }}
   db-sync.sh: |+
 {{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
 ...
diff --git a/charts/drydock/templates/job-drydock-db-init.yaml b/charts/drydock/templates/job-drydock-db-init.yaml
index 0550361a..6d97609f 100644
--- a/charts/drydock/templates/job-drydock-db-init.yaml
+++ b/charts/drydock/templates/job-drydock-db-init.yaml
@@ -43,22 +43,22 @@ spec:
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
-            - name: DB_NAME
+            - name: USER_DB_NAME
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.postgresql.user }}
                   key: DATABASE_NAME
-            - name: DB_SERVICE_USER
+            - name: USER_DB_USER
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.postgresql.user }}
                   key: DATABASE_USERNAME
-            - name: DB_SERVICE_PASSWORD
+            - name: USER_DB_PASS
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.postgresql.user }}
                   key: DATABASE_PASSWORD
-            - name: DB_FQDN
+            - name: DB_HOST
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.postgresql.user }}
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index b8d2fe00..c5d2a8e7 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -18,7 +18,7 @@
 HELM=$1
 HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
 HTK_PATH=${HTK_PATH:-""}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"42249d4243d892b7d04ce6aed9b0c8d7edcbfc7a"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"7f21b85128ea4e6e64998b916f065c3100f5c4f7"}
 DEP_UP_LIST=${DEP_UP_LIST:-"drydock"}
 BUILD_DIR=${BUILD_DIR:-$(mktemp -d)}