Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Removed use of vfc-redis from etsicatalog component"
[oom.git]
/
kubernetes
/
so
/
charts
/
so-bpmn-infra
/
resources
/
config
/
overrides
/
override.yaml
diff --git
a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index
3ae042b
..
a714ba9
100755
(executable)
--- a/
kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/
kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@
-12,16
+12,16
@@
# See the License for the specific language governing permissions and
# limitations under the License.
aai:
# See the License for the specific language governing permissions and
# limitations under the License.
aai:
- auth:
221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+ auth:
{{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
dme2:
timeout: '30000'
endpoint: https://aai.{{ include "common.namespace" . }}:8443
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
dme2:
timeout: '30000'
endpoint: https://aai.{{ include "common.namespace" . }}:8443
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
- endpoint: cds-blueprints-processor
+ endpoint: cds-blueprints-processor
-grpc
port: 9111
port: 9111
- auth:
Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+ auth:
{{ .Values.cds.auth }}
timeout: 600
camunda:
bpm:
timeout: 600
camunda:
bpm:
@@
-48,10
+48,15
@@
bpelURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081
msb-ip: msb-iag.{{ include "common.namespace" . }}
msb-port: 80
mso:
msb-ip: msb-iag.{{ include "common.namespace" . }}
msb-port: 80
mso:
- msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+ rainyDay:
+ retryDurationMultiplier: 2
+ maxRetries: 5
+ msoKey: {{ .Values.mso.key }}
correlation:
timeout: 60
logPath: logs
correlation:
timeout: 60
logPath: logs
+ config:
+ cadi: {{ include "cadi.keys" . | nindent 8}}
async:
core-pool-size: 50
max-pool-size: 50
async:
core-pool-size: 50
max-pool-size: 50
@@
-61,10
+66,10
@@
mso:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/CompleteMsoProcess
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
- auth:
Basic YnBlbDpwYXNzd29yZDEk
+ auth:
{{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.adapters.requestDb.auth )}}
db:
db:
- auth:
A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF
- password:
wLg4sjrAFUS8rfVfdvTXeQ==
+ auth:
{{ .Values.mso.adapters.db.auth }}
+ password:
{{ .Values.mso.adapters.db.password }}
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
spring:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
spring:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
@@
-76,7
+81,7
@@
mso:
db:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
po:
db:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/services/RequestsDbAdapter
po:
- auth:
A3745B5DBE165EFCF101D85A6FC81C211AB8BF604F8861B6C413D5DC90F8F30E0139DE44B8A342F4EF70AF
+ auth:
{{ .Values.mso.adapters.po.auth }}
sdnc:
endpoint: http://so-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/SDNCAdapter
rest:
sdnc:
endpoint: http://so-sdnc-adapter.{{ include "common.namespace" . }}:8086/adapters/SDNCAdapter
rest:
@@
-90,7
+95,7
@@
mso:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs
volume-groups:
rest:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs
volume-groups:
rest:
- endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}
g
:8087/services/rest/v1/volume-groups
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/volume-groups
vnf-async:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsync
vfc:
vnf-async:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsync
vfc:
@@
-109,7
+114,7
@@
mso:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
spring:
endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
db:
- auth:
Basic YnBlbDpwYXNzd29yZDEk
+ auth:
{{ include "helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
default:
adapter:
namespace: http://org.onap.mso
default:
adapter:
namespace: http://org.onap.mso
@@
-126,7
+131,7
@@
mso:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/
rollback: 'true'
sdnc:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/
rollback: 'true'
sdnc:
- password:
1D78CFC35382B6938A989066A7A7EAEF4FE933D2919BABA99EB4763737F39876C333EE5F
+ password:
{{ .Values.mso.sdnc.password }}
service:
agnostic:
sniro:
service:
agnostic:
sniro:
@@
-134,14
+139,14
@@
mso:
host: http://sniro-emulator:80
site-name: CamundaEngine
sniro:
host: http://sniro-emulator:80
site-name: CamundaEngine
sniro:
- auth:
test:testpwd
+ auth:
{{ .Values.mso.sniro.auth }}
callback: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/adapters/rest/SDNCNotify
callback: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/adapters/rest/SDNCNotify
- endpoint:
http://replaceme:28090/optimizationInstance/V1/create
+ endpoint:
{{ .Values.mso.sniro.endpoint }}
timeout: PT30M
oof:
timeout: PT30M
oof:
- auth:
test:testpwd
+ auth:
{{ .Values.mso.oof.auth }}
callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
- endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698/api/oof/v1/placement
+ endpoint: http
s
://oof-osdf.{{ include "common.namespace" . }}:8698/api/oof/v1/placement
timeout: PT30M
workflow:
CreateGenericVNFV1:
timeout: PT30M
workflow:
CreateGenericVNFV1:
@@
-320,6
+325,14
@@
server:
tomcat:
max-threads: 50
spring:
tomcat:
max-threads: 50
spring:
+ datasource:
+ hikari:
+ jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
+ username: ${DB_USERNAME}
+ password: ${DB_PASSWORD}
+ driver-class-name: org.mariadb.jdbc.Driver
+ pool-name: bpmn-pool
+ registerMbeans: true
security:
usercredentials:
-
security:
usercredentials:
-
@@
-349,5
+362,9
@@
spring:
so:
vnfm:
adapter:
so:
vnfm:
adapter:
- url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
- auth: Basic dm5mbTpwYXNzd29yZDEk
+ url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
+ auth: {{ .Values.so.vnfm.adapter.auth }}
+org:
+ onap:
+ so:
+ cloud-owner: CloudOwner