aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-09-30 13:29:41 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-30 13:29:41 +0000
commitc24008e58e49e8e92f871d12e29f85233e64ed94 (patch)
tree764c16aa0d050cdf22ed1644d0b7ab0ca30c7ad1
parent10bfee48a92b6a075817202035812f53c7dfe9bb (diff)
parent7932c8e7a7aa157de71a90a0f205236519f5739e (diff)
Merge "Update dgbuilder for https"
-rwxr-xr-xkubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh6
-rw-r--r--kubernetes/common/dgbuilder/resources/scripts/customSettings.js8
-rw-r--r--kubernetes/common/dgbuilder/values.yaml2
3 files changed, 14 insertions, 2 deletions
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