diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-09-30 13:29:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-30 13:29:41 +0000 |
| commit | c24008e58e49e8e92f871d12e29f85233e64ed94 (patch) | |
| tree | 764c16aa0d050cdf22ed1644d0b7ab0ca30c7ad1 /kubernetes/common/dgbuilder/resources | |
| parent | 10bfee48a92b6a075817202035812f53c7dfe9bb (diff) | |
| parent | 7932c8e7a7aa157de71a90a0f205236519f5739e (diff) | |
Merge "Update dgbuilder for https"
Diffstat (limited to 'kubernetes/common/dgbuilder/resources')
| -rwxr-xr-x | kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh | 6 | ||||
| -rw-r--r-- | kubernetes/common/dgbuilder/resources/scripts/customSettings.js | 8 |
2 files changed, 13 insertions, 1 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 } |