From bdd39ecd620ddf53295bdc8f9447e48fe30c0ca4 Mon Sep 17 00:00:00 2001
From: abhijit_onap <abhijit.das.gupta@huawei.com>
Date: Fri, 19 Jun 2020 00:55:31 +0530
Subject: [PATCH] Bug Fix for Postgres Deployment

Modified Postgres Version to 9.6
Modified postgres user and DB
Modified postgres service name
Mdofied applcm-broker DBHOST name

Signed-off-by: abhijit_onap <abhijit.das.gupta@huawei.com>
Change-Id: I7cc66ab33f7e933f38afd0cdb3148cbdec0d58c1
---
 .../roles/applcm/files/deploy/applcm-broker-deployment.yaml       | 8 ++++----
 .../playbooks/roles/applcm/files/deploy/postgres-config.yaml      | 4 ++--
 ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml   | 2 +-
 .../playbooks/roles/applcm/files/deploy/postgres-service.yaml     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/applcm-broker-deployment.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/applcm-broker-deployment.yaml
index 74bb34a..648b0f4 100644
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/applcm-broker-deployment.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/applcm-broker-deployment.yaml
@@ -53,13 +53,13 @@ spec:
         - name: POSTGRES_DATABASE
           value: mecmdb
         - name: DBHOST
-          value: mecmdb
+          value: postgres-db
         - name: POSTGRES_PASSWORD
-          value: password
+          value: mecm
         - name: POSTGRES_ROOT_PASSWORD
-          value: password
+          value: mecm
         - name: POSTGRES_USER
-          value: root
+          value: mecm
         - name: PACKAGE_ARTIFACT_PATH
           value: /Artifacts/Deployment/
         - name: PACKAGE_PATH
diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml
index 7cc87a3..1b6e041 100644
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-config.yaml
@@ -22,5 +22,5 @@ metadata:
     app: postgres
 data:
   POSTGRES_DB: mecmdb
-  POSTGRES_USER: root
-  POSTGRES_PASSWORD: password
+  POSTGRES_USER: mecm
+  POSTGRES_PASSWORD: mecm
diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
index 3846778..cd1439c 100644
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-k8s.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: postgres:13
+          image: postgres:9.6
           imagePullPolicy: "Always"
           envFrom:
             - configMapRef:
diff --git a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml
index 59e6147..96d4e61 100644
--- a/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml
+++ b/ocd/infra/playbooks/roles/applcm/files/deploy/postgres-service.yaml
@@ -17,7 +17,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: mecmdb
+  name: postgres-db
   namespace: default
   labels:
     app: postgres
-- 
2.16.6