From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Sun, 1 Jul 2018 14:02:45 +0000 (+0000)
Subject: Merge "make sdnctl user db password configurable for SDNC"
X-Git-Tag: 3.0.0-ONAP~497
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a99cc2c0fa3460e5c20f21a8493df1990c419736;hp=-c;p=oom.git

Merge "make sdnctl user db password configurable for SDNC"
---

a99cc2c0fa3460e5c20f21a8493df1990c419736
diff --combined kubernetes/common/dgbuilder/values.yaml
index e2d0c10709,025e52829b..759b940aea
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@@ -33,7 -33,7 +33,7 @@@ global
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/ccsdk-dgbuilder-image:0.2-STAGING-latest
 +image: onap/ccsdk-dgbuilder-image:0.2.4
  pullPolicy: Always
  
  # flag to enable debugging - application support required
@@@ -42,9 -42,11 +42,11 @@@ debugEnabled: fals
  # application configuration
  config:
    dbRootPassword: openECOMP1.0
+   dbSdnctlPassword: gamma
    dbPodName: mysql-db
    dbServiceName: sdnc-dbhost
- 
+   # MD5 hash of dguser password ( default: test123 )
+   dgUserPassword: cc03e747a6afbbcbf8be7668acfebee5
  
  # default number of instances
  replicaCount: 1
diff --combined kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 75fbae6f4e,09ee0d06b6..147d391041
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@@ -27,7 -27,7 +27,7 @@@ global
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/admportal-sdnc-image:1.3-STAGING-latest
 +image: onap/admportal-sdnc-image:1.3.4
  pullPolicy: Always
  
  # flag to enable debugging - application support required
@@@ -37,6 -37,7 +37,7 @@@ debugEnabled: fals
  config:
    mysqlChartName: sdnc-db
    dbRootPassword: openECOMP1.0
+   dbSdnctlPassword: gamma
    sdncChartName: sdnc
    configDir: /opt/onap/sdnc/data/properties
    odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
@@@ -50,7 -51,7 +51,7 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
 -  initialDelaySeconds: 60
 +  initialDelaySeconds: 180
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 69816dffb4,28e9803d62..03ae8800bd
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -74,6 -74,11 +74,11 @@@ spec
                  secretKeyRef:
                    name: {{ template "common.fullname" . }}-odl
                    key: odl-password
+             - name: SDNC_DB_PASSWORD
+               valueFrom:
+                 secretKeyRef:
+                   name: {{ template "common.fullname" . }}-sdnctl
+                   key: db-sdnctl-password
              - name: SDNC_CONFIG_DIR
                value: "{{ .Values.config.configDir }}"
              - name: ENABLE_ODL_CLUSTER
@@@ -89,7 -94,7 +94,7 @@@
              - name: SDNC_REPLICAS
                value: "{{ .Values.replicaCount }}"
              - name: MYSQL_HOST
 -              value: "{{.Values.mysql.service.name}}.{{.Release.Namespace}}"
 +              value: "{{.Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.name}}.{{.Release.Namespace}}"
            volumeMounts:
            - mountPath: /etc/localtime
              name: localtime
diff --combined kubernetes/sdnc/values.yaml
index 58adf48f99,da1430513a..0c602e50cd
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -31,7 -31,7 +31,7 @@@ global
  # application images
  repository: nexus3.onap.org:10001
  pullPolicy: Always
 -image: onap/sdnc-image:1.3-STAGING-latest
 +image: onap/sdnc-image:1.3.4
  
  # flag to enable debugging - application support required
  debugEnabled: false
@@@ -40,10 -40,10 +40,11 @@@
  config:
    odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
    dbRootPassword: openECOMP1.0
+   dbSdnctlPassword: gamma
    enableClustering: true
    binDir: /opt/onap/sdnc/bin
    geoEnabled: false
 +# if geoEnabled is set to true here, mysql.geoEnabled must be set to true
  # if geoEnabled is set to true the following 3 values must be set to their proper values
    myODLCluster: 127.0.0.1
    peerODLCluster: 127.0.0.1
@@@ -83,6 -83,7 +84,7 @@@ sdnc-portal
      mysqlChartName: sdnc-db
      configDir: /opt/onap/sdnc/data/properties
      dbRootPassword: openECOMP1.0
+     dbSdnctlPassword: gamma
      odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
  
  sdnc-ansible-server:
@@@ -104,7 -105,6 +106,7 @@@ mysql
      enabled: true
    disableNfsProvisioner: true
    replicaCount: 1
 +  geoEnabled: false
  
  dgbuilder:
    nameOverride: sdnc-dgbuilder
@@@ -112,6 -112,8 +114,8 @@@
      dbPodName: sdnc-db
      dbServiceName: sdnc-dbhost
      dbRootPassword: openECOMP1.0
+     dbSdnctlPassword: gamma
+     dgUserPassword: cc03e747a6afbbcbf8be7668acfebee5
    service:
      name: sdnc-dgbuilder
      nodePort: "03"