diff options
4 files changed, 0 insertions, 177 deletions
diff --git a/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties b/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties deleted file mode 100644 index 81c21f6ef2..0000000000 --- a/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties +++ /dev/null @@ -1,129 +0,0 @@ -log.debug.asyncQueryAAICustomer=false -log.debug.ChangeFeatureActivateV1=false -log.debug.ChangeLayer3ServiceActivateV1=false -log.debug.CompleteMsoProcess=false -log.debug.commonCompletion=false -log.debug.CreateCustomerV1=false -log.debug.CreateTenantV1=false -log.debug.DeleteTenantV1=false -log.debug.deleteVCEV1=false -log.debug.getLayer3ServiceDetailsV1=false -log.debug.l3ToHigherLayerAddBonding=false -log.debug.l3ToHigherLayerDeleteBonding=false -mso.workflow.l3ToHigherLayerAddBonding.model.invariantid=50359538-066f-4a8d-807f-f2bc8eaa79dc -mso.workflow.l3ToHigherLayerAddBonding.model.versionid=52dbec20-47aa-42e4-936c-331d8e350d44 -log.debug.Layer3ServiceActivateV1=false -log.debug.QueryAAICustomer=false -log.debug.QueryTenantInfo=false -log.debug.sdncAdapter=false -log.debug.sendAOTSTicket=false -log.debug.vnfAdapterCreateV1=false -log.debug.vnfAdapterDeleteV1=false -log.debug.RemoveLayer3Service=false -log.debug.Layer3TestAndTurnUpV1=false -log.debug.vnfAdapterRollbackV1=false -log.debug.vnfAdapterQueryV1=false -log.debug.CreateVfModuleVolume=false -log.debug.DeleteVfModuleVolume=false -log.debug.UpdateVfModuleVolume=false -log.debug.createCinderVolumeV1=false -log.debug.deleteCinderVolumeV1=false -log.debug.updateCinderVolumeV1=false -log.debug.CreateNetworkV2=false -log.debug.DeleteNetworkV2=false -log.debug.UpdateNetworkV2=false -log.debug.deleteGenericVNFV1=false -log.debug.DisconnectLayer3Service=false -log.debug.CreateVfModuleVolumeInfraV1=false -log.debug.DeleteVfModuleVolumeInfraV1=false -log.debug.UpdateVfModuleVolumeInfraV1=false -log.debug.CreateServiceInstanceInfra=false -log.debug.DeleteServiceInstanceInfra=false -log.debug.CreateNetworkInstanceInfra=false -log.debug.DeleteNetworkInstanceInfra=false -log.debug.UpdateNetworkInstanceInfra=false -log.debug.UpdateNetworkInstance=false -log.debug.DoUpdateNetworkInstance=false -log.debug.DoUpdateNetworkInstanceRollback=false -log.debug.CreateNetworkInstance=false -log.debug.DoCreateNetworkInstance=false -log.debug.DoCreateNetworkInstanceRollback=false -log.debug.DeleteNetworkInstance=false -log.debug.DoDeleteNetworkInstance=false -log.debug.DoDeleteNetworkInstanceRollback=false -log.debug.CreateViprAtmService=false -log.debug.DeleteViprAtmService=false -log.debug.GenericGetService=false -log.debug.GenericPutService=false -log.debug.GenericDeleteService=false -log.debug.CreateServiceInstance=false -log.debug.DelServiceInstance=false -log.debug.RollbackServiceInstance=false -log.debug.DoCreateServiceInstanceRollback=false -log.debug.DoDeleteServiceInstance=false -log.debug.DoCreateVfModuleVolumeRollback=false -log.debug.DoDeleteVfModuleVolumeRollback=false -log.debug.DoDeleteVfModuleVolumeV1=false -log.debug.DoCreateVfModuleVolumeV1=false -log.debug.VPECreateVfModule=false -log.debug.DHVCreateService=false -log.debug.DHVActivateService=false -log.debug.SNIROAdapter= -mso.infra.customer.id=21014aa2-526b-11e6-beb8-9e71128cae77 -mso.sniro.auth=test:testpwd -mso.sniro.endpoint=http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}/sniro/api/v2/placement -mso.sniro.timeout=PT30M -mso.service.agnostic.sniro.host=http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}} -mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement -mso.catalog.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ecomp/mso/catalog -aai.endpoint=https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}} -mso.adapters.namespace=http://org.openecomp.mso -mso.adapters.completemsoprocess.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/CompleteMsoProcess -mso.adapters.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/MsoRequestsDbAdapter -mso.adapters.openecomp.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/RequestsDbAdapter -mso.adapters.sdnc.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/SDNCAdapter -mso.adapters.sdnc.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/rest/v1/sdnc -mso.adapters.tenant.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/tenants/TenantAdapter -mso.adapters.workflow.message.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/workflows/messages/message -mso.adapters.db.auth=6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74 -mso.workflow.message.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage -mso.workflow.sdncadapter.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/SDNCAdapterCallbackService -mso.workflow.sdnc.replication.delay=PT5S -mso.workflow.aai.distribution.delay=PT30S -mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7 -mso.adapters.po.auth=6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74 -mso.sdnc.timeout=PT5M -mso.rollback=true -mso.adapters.network.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/NetworkAdapter -mso.adapters.network.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/rest/v1/networks -mso.adapters.vnf-async.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/VnfAdapterAsync -mso.workflow.vnfadapter.delete.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify -mso.workflow.vnfadapter.create.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify -mso.adapters.vnf.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/rest/v1/vnfs -mso.po.timeout=PT5M -mso.sdnc.firewall.yang.model=http://com/att/svc/mis/firewall-lite-gui -mso.sdnc.firewall.yang.model.version=2015-05-15 -mso.sdnc.timeout.firewall.minutes=20 -mso.callbackRetryAttempts=30 -mso.callbackRetrySleepTime=1000 -mso.use.qualified.host=false -mso.workflow.l3ToHigherLayerAddBonding.model.name=WAN Bonding -mso.workflow.l3ToHigherLayerAddBonding.model.version=2.0 -mso.sitename=mso-docker -mso.workflow.global.default.aai.version=11 -mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/ -mso.workflow.default.aai.v11.generic-vnf.uri=/aai/v11/network/generic-vnfs/generic-vnf -mso.workflow.default.aai.v11.vpn-binding.uri=/aai/v11/network/vpn-bindings/vpn-binding -mso.workflow.default.aai.v11.network-policy.uri=/aai/v11/network/network-policies/network-policy -mso.workflow.default.aai.v11.route-table-reference.uri=/aai/v11/network/route-table-references/route-table-reference -mso.workflow.default.aai.v11.vce.uri=/aai/v11/network/vces/vce -mso.workflow.default.aai.v11.l3-network.uri=/aai/v11/network/l3-networks/l3-network -mso.workflow.default.aai.v11.customer.uri=/aai/v11/business/customers/customer -mso.workflow.default.aai.v11.tenant.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/DFW/tenants/tenant -mso.workflow.default.aai.v11.generic-query.uri=/aai/v11/search/generic-query -#note the CloudRegionURI is used for volume-groups -mso.workflow.default.aai.v11.cloud-region.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner -mso.workflow.default.aai.v11.nodes-query.uri=/aai/v11/search/nodes-query -mso.workflow.default.aai.v11.generic-vnf.uri=/aai/v11/network/generic-vnfs/generic-vnf -mso.workflow.default.aai.v11.cloud-region.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner -aai.auth=2630606608347B7124C244AB0FE34F6F diff --git a/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties b/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties deleted file mode 100644 index 24b668bb7b..0000000000 --- a/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Workflow Adapter properties - -# BP notification endpoint that receives workflow messages -org.openecomp.mso.adapters.workflow.message.bpelurl=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage - -# Authorization for connecting to workflow.message.bpelurl -org.openecomp.mso.adapters.workflow.message.bpelauth=5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1 diff --git a/kubernetes/so/resources/config/mso/topology.properties b/kubernetes/so/resources/config/mso/topology.properties deleted file mode 100644 index 833129e15b..0000000000 --- a/kubernetes/so/resources/config/mso/topology.properties +++ /dev/null @@ -1,22 +0,0 @@ -# This is the topology used by the global healthcheck -apih-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ -jra-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ -camunda-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ - -# will be used as entry in DB to say SITE OFF/ON for healthcheck -site-name=mso-docker - -server-port={{.Values.service.internalPort}} -ssl-enable=false - -apih-healthcheck-urn=/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck -jra-healthcheck-urn=/networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck -camunda-healthcheck-urn=/mso/healthcheck - -apih-nodehealthcheck-urn=/ecomp/mso/infra/nodehealthcheck -jra-nodehealthcheck-urn=/adapters/rest/nodehealthcheck -camunda-nodehealthcheck-urn=/mso/nodehealthcheck -msb-ip={{.Values.config.msb.serviceName}} -msb-port={{.Values.config.msb.port}} -sdnc-ip={{.Values.config.sdnc.serviceName}} -sdnc-port={{.Values.config.sdnc.port}} diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml index fed4788778..067c57d412 100644 --- a/kubernetes/so/templates/deployment.yaml +++ b/kubernetes/so/templates/deployment.yaml @@ -86,16 +86,6 @@ spec: - mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml name: so-config subPath: standalone-full-ha-mso.xml - - mountPath: /etc/mso/config.d/topology.properties - name: so-config - subPath: topology.properties - - mountPath: /etc/mso/config.d/mso.workflow-message-adapter.properties - name: so-config - subPath: mso.workflow-message-adapter.properties - - mountPath: /etc/mso/config.d/mso.bpmn.urn.properties - name: so-config - subPath: mso.bpmn.urn.properties - - mountPath: /var/log/onap name: so-logs - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml @@ -185,15 +175,6 @@ spec: - key: standalone-full-ha-mso.xml path: standalone-full-ha-mso.xml mode: 0644 - - key: topology.properties - path: topology.properties - mode: 0644 - - key: mso.workflow-message-adapter.properties - path: mso.workflow-message-adapter.properties - mode: 0644 - - key: mso.bpmn.urn.properties - path: mso.bpmn.urn.properties - mode: 0644 - name: so-logs emptyDir: {} - name: so-data-filebeat |