diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-10-23 13:43:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-23 13:43:04 +0000 |
| commit | eaa96057dd72822bdefeee20fd655c12681648b2 (patch) | |
| tree | da14c5246c1cc86587b81d00f0a701a25a2c5385 /kubernetes/vid | |
| parent | eba7805efb0648ceaf0139a6ed50fabbcbe1ab10 (diff) | |
| parent | c9a6edf908894b93a386a12de74d5db98052c5fb (diff) | |
Merge "Set VID portal parameters"
Diffstat (limited to 'kubernetes/vid')
| -rw-r--r-- | kubernetes/vid/templates/deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/vid/values.yaml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index 4c635facd2..46e86df473 100644 --- a/kubernetes/vid/templates/deployment.yaml +++ b/kubernetes/vid/templates/deployment.yaml @@ -87,9 +87,11 @@ spec: - name: MSO_DME2_ENABLED value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }} - name: VID_ECOMP_REDIRECT_URL - value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm + value: https://{{ .Values.config.portalhost }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm - name: VID_ECOMP_REST_URL - value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/auxapi + value: https://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapportrest }}/ONAPPORTAL/auxapi + - name: VID_ROLE_ACCESS_CENTRALIZED + value: "{{ .Values.config.roleaccesscentralized }}" - name: VID_CONTACT_US_LINK value: "{{ .Values.config.vidcontactuslink }}" - name: VID_UEB_URL_LIST diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index ba712ca9ab..c36b873a60 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -39,7 +39,9 @@ config: asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=" asdcclientrestport: "8080" vidaaiport: "8443" - onapport: "8989" + onapport: "30225" + onapportrest: "8443" + portalhost: "portal.api.simpledemo.onap.org" msoport: "8080" vidmsopass: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz msodme2serverurl: http://localhost:8081 @@ -51,6 +53,7 @@ config: vidmysqlmaxconnections: "5" logstashServiceName: log-ls logstashPort: 5044 + roleaccesscentralized: remote # subchart configuration vid_mariadb_galera: |