[CORD-2909] Flatten and parameterize charts

Change-Id: I695c1df063b0f6f6ccf280254d54cc701292348f
diff --git a/xos-core/templates/db-deployment.yaml b/xos-core/templates/db-deployment.yaml
index c103e09..d508962 100644
--- a/xos-core/templates/db-deployment.yaml
+++ b/xos-core/templates/db-deployment.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,28 +25,21 @@
     metadata:
       labels:
         app: xos-db
-      annotations:
-        checksum/config-map: {{ include (print $.Template.BasePath "/db-configmap.yaml") . | sha256sum }}
     spec:
       containers:
         - name: xos-db
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_db.repository }}:{{ .Values.images.xos_db.tag }}
-          imagePullPolicy: {{ .Values.images.xos_db.pullPolicy }}
+          image: {{ .Values.postgresImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           ports:
             - containerPort: 5432
               protocol: TCP
           env:
-            - name: SERVICE_5432_NAME
-              valueFrom:
-                configMapKeyRef:
-                  name: xos-db
-                  key: service_5432_name
             - name: POSTGRES_DB
-              value: {{ .Values.configs.core_config.database.name | quote }}
+              value: {{ .Values.xosDBName | quote }}
             - name: POSTGRES_USER
-              value: {{ .Values.configs.core_config.database.username | quote }}
+              value: {{ .Values.xosDBUser | quote }}
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: xos-db-secret
-                  key: postgres-password
+                  name: xos-db-secrets
+                  key: password