From: Timoney, Dan (dt5972) <dtimoney@att.com>
Date: Fri, 27 Sep 2019 14:38:22 +0000 (-0400)
Subject: Update dgbuilder for https
X-Git-Tag: 5.0.1-ONAP~35^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7932c8e7a7aa157de71a90a0f205236519f5739e;p=oom.git

Update dgbuilder for https

Update dgbuilder to use latest release (0.6.3) with https support and
update configuration to enable https

Change-Id: Ia04a3cde6b0f18655301e25dcf125ffcdf1ec120
Issue-ID: OJSI-100
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---

diff --git a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
index aaf7a2615c..b037058c2b 100755
--- a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
+++ b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
@@ -85,6 +85,12 @@ then
 	echo "		'dbUser': '$dbUser'," >>$customSettingsFile
 	echo "		'dbPassword': '$dbPassword'," >>$customSettingsFile
 	echo "		'gitLocalRepository': '$gitLocalRepository'" >>$customSettingsFile
+	echo "		'restConfUrl': '$restConfUrl'," >>$customSettingsFile
+	echo "		'restConfUser': '$restConfUser'," >>$customSettingsFile
+	echo "		'restConfPassword': '$restConfPassword'," >>$customSettingsFile
+	echo "		'formatXML': '$formatXML'," >>$customSettingsFile
+	echo "		'formatJSON': '$formatJSON'," >>$customSettingsFile
+	echo "		'enableHttps': true" >>$customSettingsFile
 	echo "		}" >>$customSettingsFile
 fi
 	#echo "Created custom settings  file $customSettingsFile"
diff --git a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
index e3349b9d5a..66b7b5ed15 100644
--- a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
+++ b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
@@ -35,6 +35,11 @@ module.exports={
     "dbUser": "sdnctl",
     "dbPassword": "{{.Values.config.dbSdnctlPassword}}",
     "gitLocalRepository": "",
+    "restConfUrl": "http://localhost:8181/restconf/operations/SLI-API:execute-graph",
+    "restConfUser": "admin",
+    "restConfPassword": "admin",
+    "formatXML": "Y",
+    "formatJSON": "Y",
     "httpRoot": "/",
     "disableEditor": false,
     "httpAdminRoot": "/",
@@ -49,5 +54,6 @@ module.exports={
     },
     "uiHost": "0.0.0.0",
     "version": "0.9.1",
-    "performGitPull": "N"
+    "performGitPull": "N",
+    "enableHttps" : true
 }
diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index df52fbc64b..fa205e227e 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -47,7 +47,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-dgbuilder-image:0.6.0
+image: onap/ccsdk-dgbuilder-image:0.6.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required