diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-05-31 18:18:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-31 18:18:06 +0000 |
| commit | e5da11e8c4de170145799198be1a076741d69301 (patch) | |
| tree | 83551f9e734754fc5f9bf0daf7c45b0723611f7c /kubernetes | |
| parent | 08b9d7917c4bdf33cbb259306970d1763197b4c8 (diff) | |
| parent | d4b37e233cdc04c7dfa33e0c1d61f55a263b693b (diff) | |
Merge "Updating the config mount point and HAS url"
Diffstat (limited to 'kubernetes')
| -rwxr-xr-x | kubernetes/oof/resources/config/osdf_config.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/oof/values.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/oof/resources/config/osdf_config.yaml b/kubernetes/oof/resources/config/osdf_config.yaml index 7fe63a50c8..b244859119 100755 --- a/kubernetes/oof/resources/config/osdf_config.yaml +++ b/kubernetes/oof/resources/config/osdf_config.yaml @@ -25,7 +25,7 @@ osdfCMSchedulerPassword: {{ .Values.config.osdfCMSchedulerPassword }} soUsername: {{ .Values.config.soUsername }} soPassword: {{ .Values.config.soPassword }} -conductorUrl: "{{.Release.Name}}-has-api.{{include "common.namespace" .}}:TODO-PORT-FOR-HAS-API" +conductorUrl: {{ .Values.config.conductorUrl }} conductorUsername: {{ .Values.config.conductorUsername }} conductorPassword: {{ .Values.config.conductorPassword }} conductorPingWaitTime: {{ .Values.config.conductorPingWaitTime }} diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml index 9f74271418..51114a6279 100644 --- a/kubernetes/oof/values.yaml +++ b/kubernetes/oof/values.yaml @@ -34,7 +34,7 @@ debugEnabled: false # application configuration config: - msbgateway: msb-iag.{{ include "common.namespace" . }} + msbgateway: msb-iag msbPort: 80 # Credentials for the OOF placement service – SO. osdfPlacementSOUsername: so_test @@ -46,7 +46,7 @@ config: soUsername: "" # SO username for call back. soPassword: "" # SO password for call back. # Url and credentials for Conductor. - conductorUrl: https://oof-has-api.{{ include "common.namespace" . }}:8091/v1/plans/ + conductorUrl: http://oof-has-api:8091/v1/plans/ conductorUsername: admin1 conductorPassword: plan.15 conductorPingWaitTime: 60 |