summaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-05-07 11:55:15 -0400
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-05-08 20:20:42 +0000
commit2499fccc820ea177d1c5b7ae00b80c1fc55b2638 (patch)
treebc46caf8c07422716023d63ec866008aa9459b81 /kubernetes/so
parent0fe4eb7bb654a7bdc114775cd941d4f5ab146d08 (diff)
Add latest SO configuration changes
Adds watchdog config and tables, oof configuration, aai athentication, etc. Change-Id: I43b5432d12c69ef45cdbeff5ab3427fbf5e9d1d0 Issue-ID: OOM-1039 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com> Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/so')
-rw-r--r--kubernetes/so/charts/mariadb/values.yaml4
-rwxr-xr-xkubernetes/so/resources/config/mso/mso-docker.json43
-rw-r--r--kubernetes/so/values.yaml8
3 files changed, 49 insertions, 6 deletions
diff --git a/kubernetes/so/charts/mariadb/values.yaml b/kubernetes/so/charts/mariadb/values.yaml
index 0af4d98101..76d4d092ee 100644
--- a/kubernetes/so/charts/mariadb/values.yaml
+++ b/kubernetes/so/charts/mariadb/values.yaml
@@ -47,14 +47,14 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 90
periodSeconds: 10
## Persist data to a persitent volume
diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 92988ba2f0..aa3cac7137 100755
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -7,12 +7,28 @@
{
"mso_config_path": "/etc/mso/config.d/",
+ "mso-topology-config":
+ {
+ "msb-server-ip": "{{.Values.config.msb.serviceName}}",
+ "msb-server-port": "{{.Values.config.msb.port}}"
+ },
+
"mso-api-handler-infra-config":
{
"bpelURL": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}",
"bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
"camundaURL": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}",
- "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+ "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+ "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
+ "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+ "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
+ },
+
+ "mso-asdc-controller-config":
+ {
+ "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
+ "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+ "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
},
"asdc-connections":
@@ -27,6 +43,10 @@
"password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
"pollingInterval": 60,
"pollingTimeout": 60,
+ "watchDogTimeout": "300",
+ "messageBusAddress": [
+ "{{.Values.config.messagerouter.serviceName}}"
+ ],
"relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
"activateServerTLSAuth": "false",
"keyStorePassword": "",
@@ -46,7 +66,8 @@
"http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/NBNC-API:",
"http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/NORTHBOUND-API:service-topology-operation",
"http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/GENERIC-RESOURCE-API:",
- "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/VNFTOPOLOGYAIC-API:"
+ "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/VNFTOPOLOGYAIC-API:",
+ "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/"
],
"bpelurl": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/SDNCAdapterCallbackService",
@@ -56,6 +77,7 @@
"bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
"sdncconnecttime": "5000"
},
+
"mso-po-adapter-config":
{
"identity_services":
@@ -107,7 +129,6 @@
"ueb_consumer_id": "testuser",
"ueb_topic": "queuetopic",
"ueb_polling_interval": "30",
- "ueb_polling_interval": "30",
"ueb_user": "user",
"ueb_password": "1ec0d74615d4e4639f991c0590c83b88",
"bpel_url": "http://localhost:18080",
@@ -132,6 +153,11 @@
"sniroTimeout": "PT30M",
"serviceAgnosticSniroHost": "http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}",
"serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
+ "oofAuth": "test:testpwd",
+ "oofEndpoint": "http://{{.Values.config.oof.serviceName}}:{{.Values.config.oof.port}}/api/oof/v1/placement",
+ "oofTimeout": "PT30M",
+ "serviceAgnosticOofHost": "http://{{.Values.config.oof.serviceName}}:{{.Values.config.oof.port}}",
+ "serviceAgnosticOofEndpoint": "/api/oof/v1/placement",
"aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
"aaiAuth": "2630606608347B7124C244AB0FE34F6F",
"adaptersNamespace": "http://org.openecomp.mso",
@@ -165,6 +191,17 @@
"sdncTimeoutFirewall": "20",
"callbackRetryAttempts": "30",
"callbackRetrySleepTime": "1000",
+ "appcClientTopicRead": "APPC-LCM-READ",
+ "appcClientTopicWrite": "APPC-LCM-WRITE",
+ "appcClientTopicSdncRead": "SDNC-LCM-READ",
+ "appcClientTopicSdncWrite": "SDNC-LCM-WRITE",
+ "appcClientTopicReadTimeout": "360000",
+ "appcClientResponseTime": "360000",
+ "appcClientPoolMembers": "{{.Values.config.messagerouter.serviceName}}:{{.Values.config.messagerouter.port}}",
+ "appcClientKey": "VIlbtVl6YLhNUrtU",
+ "appcClientSecret": "64AG2hF4pYeG2pq7CT6XwUOT",
+ "appcClientService": "ueb",
+ "sdncSiSvcTypes": "PORT-MIRROR,PPROBE",
"workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
"workflowL3ToHigherLayerAddBondingModelVersion" : "2.0"
}
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index a250cea44f..9a8e3bff30 100644
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -51,10 +51,16 @@ config:
port: 80
aai:
serviceName: aai
- port: 8080
+ port: 8443
+ messagerouter:
+ serviceName: message-router
+ port: 3904
msb:
serviceName: msb-iag
port: 80
+ oof:
+ serviceName: oof-has-api
+ port: 8091
sdnc:
serviceName: sdnc
port: 8282