diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-27 10:38:22 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-09-27 10:38:22 -0400 |
| commit | 7932c8e7a7aa157de71a90a0f205236519f5739e (patch) | |
| tree | 850c833b4fbf68a42304585b13fe6c2bb46a4289 | |
| parent | 92299a31899fb4509175cc1c1b7c504938e22cfd (diff) | |
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>
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 |