From e6895a5cb97830ec243168423a83af586a17f608 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Thu, 2 Aug 2018 20:57:23 -0400 Subject: [PATCH] Support for docker-compose in heat environment docker-compose.yml now contains a configuration for all of the containers containers. mariadb, catalog-db-adapter, and request-db-adapter seem to start up and work normally. I serialized the initializaion of these because that was the easiest way to ensure they all come up before any other apps. The catalog and request db adapters could come up in parallel. Looks like the sdnc adapter comes up ok. The other apps still need some debugging. Change-Id: I5730b777ae76dff7552d6024c69a346b9bccfb40 Issue-ID: SO-710 Signed-off-by: Rob Daugherty --- README.md | 10 +- docker-compose.yml | 277 +++++++++++++++++++-- volumes/mso/chef-config/mso-docker.json | 250 ------------------- volumes/mso/chef-config/onap-ca.crt | 100 -------- .../ca-certificates/onapheat/onap-ca.crt} | 0 .../api-handler-infra/onapheat/override.yaml} | 0 .../config/asdc-controller/onapheat/override.yaml} | 4 +- .../config/bpmn-infra/onapheat/override.yaml} | 8 +- .../catalog-db-adapter/onapheat/override.yaml} | 21 +- .../openstack-adapter/onapheat/override.yaml} | 2 +- .../request-db-adapter/onapheat/override.yaml} | 9 +- .../config/sdnc-adapter/onapheat/override.yaml} | 4 +- .../config/vfc-adapter/onapheat/override.yaml} | 8 +- 13 files changed, 294 insertions(+), 399 deletions(-) delete mode 100644 volumes/mso/chef-config/mso-docker.json delete mode 100644 volumes/mso/chef-config/onap-ca.crt rename volumes/{mso/chef-config/onap-ca-new.crt => so/ca-certificates/onapheat/onap-ca.crt} (100%) rename volumes/{mso/configuration/api-handler/override-onapheat.yaml => so/config/api-handler-infra/onapheat/override.yaml} (100%) rename volumes/{mso/configuration/asdc-controller/override-onapheat.yaml => so/config/asdc-controller/onapheat/override.yaml} (97%) rename volumes/{mso/configuration/bpmn-infrastructure/override-onapheat.yml => so/config/bpmn-infra/onapheat/override.yaml} (98%) rename volumes/{mso/configuration/catalog-db/override-onapheat.yaml => so/config/catalog-db-adapter/onapheat/override.yaml} (71%) rename volumes/{mso/configuration/openstack-adapter/override-onapheat.yaml => so/config/openstack-adapter/onapheat/override.yaml} (98%) rename volumes/{mso/configuration/request-db/override-onapheat.yaml => so/config/request-db-adapter/onapheat/override.yaml} (91%) rename volumes/{mso/configuration/sdnc-adapter/override-onapheat.yaml => so/config/sdnc-adapter/onapheat/override.yaml} (99%) rename volumes/{mso/configuration/vfc-adapter/override-onapheat.yml => so/config/vfc-adapter/onapheat/override.yaml} (90%) diff --git a/README.md b/README.md index ae75cfb..0efdeac 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,8 @@ -MSO Configuration -================= +Docker Configuration +==================== This repository provides files to: * configure Docker (compose, etc.) -* configure MariaDB and deploy scripts ot it -* provide a Chef environment +* configure MariaDB and deploy scripts for it -License and Authors -------------------- -Authors: pete/eddie/kevin License: Apache License, version 2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 1769b46..2a02858 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,7 @@ networks: driver_opts: com.docker.network.driver.mtu: ${MTU} services: +################################################################################ mariadb: image: mariadb:10.1.11 ports: @@ -15,40 +16,286 @@ services: environment: - MYSQL_ROOT_PASSWORD=password hostname: - db.mso.testlab.openecomp.org + mariadb.so.testlab.onap.org logging: driver: "json-file" options: max-size: "30m" max-file: "5" - mso: - image: openecomp/mso +################################################################################ + catalog-db-adapter: + image: so/catalog-db-adapter ports: - - "3904:3904" - - "3905:3905" - - "8080:8080" - - "9990:9990" + - "8082" volumes: - - ./volumes/mso/chef-config:/shared + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/catalog-db-adapter/onapheat:/app/config environment: - - MYSQL_ROOT_PASSWORD=password - - ONAP_IP=${OPENO_IP} + - APP=catalog-db-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password hostname: - mso.mso.testlab.openecomp.org + catalog-db-adapter.so.testlab.onap.org depends_on: - mariadb - links: - - mariadb logging: driver: "json-file" options: max-size: "30m" max-file: "5" command: - - /wait-for.sh + - /app/wait-for.sh - -q - -t - "300" - mariadb:3306 - -- - - /opt/mso/scripts/start-jboss-server.sh + - "/app/start-app.sh" +################################################################################ + request-db-adapter: + image: so/request-db-adapter + ports: + - "8083" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/request-db-adapter/onapheat:/app/config + environment: + - APP=request-db-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + request-db-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - catalog-db-adapter:8082 + - -- + - "/app/start-app.sh" +################################################################################ + sdnc-adapter: + image: so/sdnc-adapter + ports: + - "8086" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/sdnc-adapter/onapheat:/app/config + environment: + - APP=sdnc-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + sdnc-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + openstack-adapter: + image: so/openstack-adapter + ports: + - "8087" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/openstack-adapter/onapheat:/app/config + environment: + - APP=openstack-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + openstack-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + vfc-adapter: + image: so/vfc-adapter + ports: + - "8084" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/vfc-adapter/onapheat:/app/config + environment: + - APP=vfc-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + vfc-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + asdc-controller: + image: so/asdc-controller + ports: + - "8085" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/asdc-controller/onapheat:/app/config + environment: + - APP=asdc-controller + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + asdc-controller.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + bpmn-infra: + image: so/bpmn-infra + ports: + - "8081" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/bpmn-infra/onapheat:/app/config + environment: + - APP=bpmn-infra + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + bpmn-infra.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + api-handler-infra: + image: so/api-handler-infra + ports: + - "8080" + volumes: + - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./volumes/so/config/api-handler-infra/onapheat:/app/config + environment: + - APP=api-handler-infra + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + api-handler-infra.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" diff --git a/volumes/mso/chef-config/mso-docker.json b/volumes/mso/chef-config/mso-docker.json deleted file mode 100644 index 99acbb4..0000000 --- a/volumes/mso/chef-config/mso-docker.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "name": "mso-docker", - "description": "MSO Docker Images", - "chef_type": "environment", - "json_class": "Chef::Environment", - "default_attributes": - { - "mso_config_path": "/etc/mso/config.d/", - - "mso-topology-config": - { - "msb-server-ip": "172.30.3.34", - "msb-server-port": "80" - }, - - "mso-api-handler-infra-config": - { - "bpelURL": "http://mso:8080", - "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", - "camundaURL": "http://mso:8080", - "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1", - "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443", - "aaiAuth": "2630606608347B7124C244AB0FE34F6F", - "msoKey": "07a7159d3bf51a0e53be7a8f89699be7" - }, - - "mso-asdc-controller-config": - { - "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443", - "aaiAuth": "2630606608347B7124C244AB0FE34F6F", - "msoKey": "07a7159d3bf51a0e53be7a8f89699be7" - }, - - "asdc-connections": - { - "asdc-controller1": - { - "user": "mso", - "consumerGroup": "sdc-OpenSource-Env1", - "consumerId": "sdc-COpenSource-Env11", - "environmentName": "SDC-OpenSource-Env1", - "asdcAddress": "c2.vm1.sdc.simpledemo.openecomp.org:8443", - "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247", - "pollingInterval": 60, - "pollingTimeout": 60, - "watchDogTimeout": "300", - "messageBusAddress": [ "10.0.11.1" ], - "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL", - "activateServerTLSAuth": "false", - "keyStorePassword": "", - "keyStorePath": "" - }, - - "asdc-controller2": - { - "user": "user", - "consumerGroup": "mso", - "consumerId": "mso", - "environmentName": "PROD", - "asdcAddress": "asdc_hostname2:8443", - "password": "f3895035812addbf115bfaf7d2dc850e", - "pollingInterval": 60, - "pollingTimeout": 60, - "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL", - "activateServerTLSAuth": "false", - "keyStorePassword": "", - "keyStorePath": "" - } - }, - - "mso-sdnc-adapter-config": - { - "sdncurls": - [ - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/L3SDN-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config/L3SDN-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/Firewall-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNF-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NBNC-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/GENERIC-RESOURCE-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:", - "http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/" - ], - - "bpelurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/mso/SDNCAdapterCallbackService", - "restbpelurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/mso/WorkflowMessage", - "myurl": "http://c1.vm1.mso.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify", - "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73", - "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1", - "sdncconnecttime": "5000" - }, - - "mso-po-adapter-config": - { - "identity_services": - [ - { - "dcp_clli": "RAX_KEYSTONE", - "identity_url": "https://identity.api.rackspacecloud.com/v2.0", - "mso_id": "RACKSPACE_ACCOUNT_ID", - "mso_pass": "RACKSPACE_ACCOUNT_APIKEY", - "admin_tenant": "service", - "member_role": "admin", - "tenant_metadata": "true", - "identity_server_type": "KEYSTONE", - "identity_authentication_type": "RACKSPACE_APIKEY" - } - ], - - "cloud_sites": - [ - { - "id": "Dallas", - "aic_version": "2.5", - "lcp_clli": "DFW", - "region_id": "DFW", - "identity_service_id": "RAX_KEYSTONE" - }, - - { - "id": "Northern Virginia", - "aic_version": "2.5", - "lcp_clli": "IAD", - "region_id": "IAD", - "identity_service_id": "RAX_KEYSTONE" - }, - - { - "id": "Chicago", - "aic_version": "2.5", - "lcp_clli": "ORD", - "region_id": "ORD", - "identity_service_id": "RAX_KEYSTONE" - } - ], - - "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1", - "checkrequiredparameters": "true", - "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" - }, - - "mso-workflow-message-adapter-config": - { - "wmbpelurl": "http://mso:8080/mso/WorkflowMessage", - "wmbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" - }, - - "mso-appc-adapter-config": - { - "appc_url": "http://localhost:18080", - "appc_stub": "/AppC-Simulator/action/execute", - "appc_auth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", - "appc_timeout": "30", - "ueb_cluster_address": "http://localhost:18080", - "ueb_consumer_group": "testgroup", - "ueb_consumer_id": "testuser", - "ueb_topic": "queuetopic", - "ueb_polling_interval": "30", - "ueb_user": "user", - "ueb_password": "1ec0d74615d4e4639f991c0590c83b88", - "bpel_url": "http://localhost:18080", - "bpel_stub": "/AppC-Simulator/bpmn/appCResponse", - "bpel_auth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", - "bpel_timeout": "30" - }, - - "mso-bpmn-config": - { - "urnFileSystemLoadingEnabled": "true" - }, - - "mso-bpmn-urn-config": - { - "debug":"false", - "invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc", - "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44", - "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77", - "sniroAuth": "test:testpwd", - "sniroEndpoint": "http://sniro.api.simpledemo.openecomp.org:8080/sniro/api/v2/placement", - "sniroTimeout": "PT30M", - "serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080", - "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement", - "oofAuth": "test:testpwd", - "oofEndpoint": "http://oof.api.simpledemo.openecomp.org:8698/api/oof/v1/placement", - "oofTimeout": "PT30M", - "serviceAgnosticOofHost": "http://oof.api.simpledemo.openecomp.org:8698", - "serviceAgnosticOofEndpoint": "/api/oof/v1/placement", - "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443", - "aaiAuth": "2630606608347B7124C244AB0FE34F6F", - "adaptersNamespace": "http://org.openecomp.mso", - "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess", - "adaptersDbEndpoint": "http://mso:8080/dbadapters/MsoRequestsDbAdapter", - "adaptersOpenecompDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter", - "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog", - "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter", - "adaptersSdncRestEndpoint": "http://mso:8080/adapters/rest/v1/sdnc", - "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter", - "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", - "adaptersWorkflowMessageEndpoint": "http://mso.api.simpledemo.openecomp.org:8080/workflows/messages/message", - "workflowMessageEndpoint": "http://mso:8080/mso/WorkflowMessage", - "workflowSdncAdapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService", - "workflowSdncReplicationDelay": "PT5S", - "workflowAaiDistributionDelay": "PT30S", - "msoKey": "07a7159d3bf51a0e53be7a8f89699be7", - "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", - "sdncTimeout": "PT5M", - "rollback": "true", - "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter", - "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks", - "adaptersVnfAsyncEndpoint": "http://mso:8080/vnfs/VnfAdapterAsync", - "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify", - "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify", - "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs", - "workflowVnfAdapterRestCallback": "http://mso:8080/mso/vnfAdapterRestNotify", - "poTimeout": "PT5M", - "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui", - "sdncFirewallYangModelVersion": "2015-05-15", - "sdncTimeoutFirewall": "20", - "callbackRetryAttempts": "30", - "callbackRetrySleepTime": "1000", - "appcClientTopicRead": "APPC-LCM-WRITE", - "appcClientTopicWrite": "APPC-LCM-READ", - "appcClientTopicSdncRead": "SDNC-LCM-WRITE", - "appcClientTopicSdncWrite": "SDNC-LCM-READ", - "appcClientTopicReadTimeout": "360000", - "appcClientResponseTime": "360000", - "appcClientPoolMembers": "ueb01.simpledemo.openecomp.org:3904,ueb02.simpledemo.openecomp.org:3904", - "appcClientKey": "VIlbtVl6YLhNUrtU", - "appcClientSecret": "64AG2hF4pYeG2pq7CT6XwUOT", - "appcClientService": "ueb", - "sdncSiSvcTypes": "PORT-MIRROR,PPROBE", - "workflowL3ToHigherLayerAddBondingModelName": "WAN Bonding", - "workflowL3ToHigherLayerAddBondingModelVersion": "2.0", - "msoDefaultCloudOwnerId": "att-aic", - "dmaapHost" : "10.42.111.36", - "dmaapPort" : "8904" - } - }, - - "override_attributes": - { - }, - - "cookbook_versions": - { - "mso-config": "~> 1.0.0" - } -} diff --git a/volumes/mso/chef-config/onap-ca.crt b/volumes/mso/chef-config/onap-ca.crt deleted file mode 100644 index 51e19b5..0000000 --- a/volumes/mso/chef-config/onap-ca.crt +++ /dev/null @@ -1,100 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFpTCCA42gAwIBAgIJAJqx8dKnCZZoMA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD -VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV -BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl -bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn -MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy -ODIxMTQyNloXDTIxMTEyNzIxMTQyNlowga0xCzAJBgNVBAYTAlVTMQswCQYDVQQI -DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw -EQYDVQQLDApzaW1wbGVkZW1vMSowKAYDVQQDDCFPcGVuRUNPTVAgc2ltcGxlZGVt -byBTZXJ2ZXIgQ0EgWDExJzAlBgkqhkiG9w0BCQEWGHNpbXBsZWRlbW9Ab3BlbmVj -b21wLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALr4rivKQuRk -YNf5Ig40e1nqj6s6LB1vgMOYbKfRziOFpPcUpsHPOhusHowiUsrU1vdFSzPz6Ej7 -PjlmNSg2Qka8YCn9kd6QgM7U0KcPJvIucBp+qjifH3EvP0jgDPhDeVRYxzV454dv -5kQ9uCpswJP7YAnX51dkWeH8nwPUoagt31bOl9LXENSrgxEThxdLYMJnQJWk2CmV -otXM4tT1dxyJxFUrZ6uJCEAYw5VtlplqihHf8lHy+sWQavtsLz/4dc+sGeXSTfoI -voKvoh3uZ5gEhGV8yfJxk1veX5y5/AxP80vQ+smWYjTnQL5QQ57y4bciez4XVBmQ -SWimWtOi4e8CAwEAAaOBtTCBsjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE -AwIBhjAdBgNVHQ4EFgQUTqdsYgGNGubdJHq9tsaJhM9HE5wwcAYDVR0gBGkwZzBl -BgRVHSAAMF0wWwYIKwYBBQUHAgIwTxpNSWYgeW91IHRydXN0IHRoaXMgY2VydCB0 -aGVuIHdlIGhhdmUgYSBicmlkZ2UgdGhhdCB5b3UgbWlnaHQgYmUgaW50ZXJlc3Rl -ZCBpbi4wDQYJKoZIhvcNAQELBQADggIBAKNNlRqFuE/JgV1BHyYK0xoSXH4aZP/7 -IoHtDVcSaZAOOuFOUrwVMUbzRBebbb6RpFwt/X+NLFUGysd+XNLF7W7lzxKtmFNX -n4OpNkBe0y5O7yurus8rERHzu3jiOSgVo+WzDlGpYSRnG3hI2qPWqD+Puzx/WwI8 -XUTuzEQQ3gUSyVFfXHpay3VpYmLZiLJ9WKY5SDw7Ie6Sxrju4Qm1HwnFY8wHZGcs -2KMQzorJ1ZNQf523yUTghbT0rKaSFaD8zugPtI2ONfFG/QgrkQXo78opzPsHnHwa -SxGSiAgeLbwAUCvPNl27zr6k6+7TcNjV0VUivAs0OG3VEAdgi7UWYB+30KfWwHwE -zGmvd4IAGqIqlqLcSVArN5z8JK1B5nfjQn5UrclU1vK+dnuiKE2X4rKuBTRYRFR/ -km+mj4koYFPKFHndmJl1uv2OCJK9l5CSIuKWeI1qv8BASKqgNdoT/SKBXqxgYlCb -o+j4IDjxrxChRO+e5vl9lA7INfRrbljCkUjfLRa+v2q9tWQ3+EQUwwnSrSfihh2T -j0Tksr6b8dDsvMlCdOKG1B+JPcEXORSFKNXVTEfjqpJG8s16kFAocWt3S6xO0k1t -qbQp+3tWQgW2TGnX0rMZzB6NGRNfWhlYmq2zHgXkiCIZ26Ztgt/LNbwEvN3+VlLo -z/Rd+SKtlrfb ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIGQTCCBCmgAwIBAgIJANSi/bsXEOI5MA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD -VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV -BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl -bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn -MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy -ODIxMTQyNVoXDTI2MTEyNjIxMTQyNVowgb0xCzAJBgNVBAYTAlVTMQswCQYDVQQI -DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw -EQYDVQQLDApzaW1wbGVkZW1vMTowOAYDVQQDDDFPcGVuRUNPTVAgc2ltcGxlZGVt -byBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MScwJQYJKoZIhvcNAQkBFhhz -aW1wbGVkZW1vQG9wZW5lY29tcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -ggIKAoICAQDLgdDTCZX5xlMFIo+tjj5DItAwbutQE3NMchx/CRIuYwRCBOEO0yOs -AdnZAuheYrjv/Dw4wKNzcvtIlYbfiPsGWVvx5j6+xoGBLLwIOnDyzD2B62uCvMs9 -47MAuiqpPojPwDDb9fF5EIhlC+cBzSYKm7D5ihYxmUCnh9yHIPEMq0IoVj2illlK -eCTLW+bZKeaKoWdkFxyyzykOoMFgZTUm01EhDIt1DHTve675Qq80UgzrZdSK6Zjv -3wLV7tkJSGmCkbUELpxsTLKYuaGUkE0m5n3SMUcvBDa6WNQpWlUbZlTwWotOrxfN -Gib3nGiqyCmQXrVvuuBDzmZifZaJpBGiiGiOxp0j79E/OZkfk/9V3Hvfy78Ss9H5 -uhf/ACGKsUq9nN25u+Wpz7EzAQm/OBubBrBCMP/8pm+y1jCfQ6Bwd0Nm48KrJkTe -ySkferISNmpQZ2dyZXQVXMarbRfagQ6XdJw6EVnDwydVzb5LAqam3JUXjsHIj7Gv -2DmXwJtwV+cnKB/OxRsP/JWwlyC9pFGy17HWc7EwPqXm1UNdDM36UaoBDzsh3DcI -vg5+BOOtYPmiZ2+CMD2JxAXmtCMAmQA1mSsW7beTuHKy+7EdCAWcregE60PE3w2l -G8n50YSXb0WZ2IaQUsBhhpZmu6VVTEcoi5eMglI6QyO21y0oKPYWPQIDAQABo0Iw -QDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmmQF -QD3oWZUOVE81Qc9WSfcyqwwwDQYJKoZIhvcNAQELBQADggIBAE1ArwZwMVVJe1Pj -p1R9+Q766Qhzh4EN9RFCsktCcf4pB23lPtFhMhIZJP5eZKLB4MUIvtmleU+DmOWf -jcEcgauMrc9Ihacra+IRJsr4JQjQSDHoEgl/yR6VUd9vbGH66ElIg9nP7XWAE6h5 -DTAxA8X1qyUOVGsKAps2uhBwNtl8RdX6GrZahkSOUMOq3H4wyEEPQlpU2AewZqOU -p0vdbQ/is6cbJh6dgxFrSzBti/MKj/EPM6yJwlO+RfGlJmEI7J7bLEYIeNssLnv6 -FGiOgyWQ+gmwVK827F4Jwoght2BCcNsG/oPkAPbdw4yRIyi92QSWMEBKibECypQE -a1DYvfHWGQLQifGzFuJTOca9vgu2B/BQ+0Ii4DqMS8hc2rw1CAD5zHAT/BIgAKM6 -ygL5Oyvrj8AQLgOkjhFh0HFKneh4j7wBtibpmDnBoSv227PAtdytCoRgivjhmF5B -Ryx7BswcTEtZHWHxD/i2wlMEGNqGbcRmCCy9hhCxitAz70aq3Y/pC46n7w5bOmvJ -Ap9D+WmTJ9PdpDjiwCXCkMD3QaTuUV1W3Zr4mLLj6gRLb6ycgDrsqXnY6/JB/AOd -gxFK9q1vjhm02FAABIa+kL10CKPuRdlE/GsWl03WKMeT5bY3MTO3odsNXhKWA19h -wUAp0gnljuFHPX7jWwruZ1eD8mQv ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV -BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx -NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK -DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC -ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 -XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn -H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM -pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 -NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg -2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY -wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd -ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM -P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 -aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY -PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G -A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ -UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN -BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz -L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 -7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx -c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf -jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 -RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h -PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF -CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ -Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A -cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR -ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX -dYY= ------END CERTIFICATE----- diff --git a/volumes/mso/chef-config/onap-ca-new.crt b/volumes/so/ca-certificates/onapheat/onap-ca.crt similarity index 100% rename from volumes/mso/chef-config/onap-ca-new.crt rename to volumes/so/ca-certificates/onapheat/onap-ca.crt diff --git a/volumes/mso/configuration/api-handler/override-onapheat.yaml b/volumes/so/config/api-handler-infra/onapheat/override.yaml similarity index 100% rename from volumes/mso/configuration/api-handler/override-onapheat.yaml rename to volumes/so/config/api-handler-infra/onapheat/override.yaml diff --git a/volumes/mso/configuration/asdc-controller/override-onapheat.yaml b/volumes/so/config/asdc-controller/onapheat/override.yaml similarity index 97% rename from volumes/mso/configuration/asdc-controller/override-onapheat.yaml rename to volumes/so/config/asdc-controller/onapheat/override.yaml index d7f8a5b..888ac1d 100644 --- a/volumes/mso/configuration/asdc-controller/override-onapheat.yaml +++ b/volumes/so/config/asdc-controller/onapheat/override.yaml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8085 spring: security: @@ -48,4 +48,4 @@ mso: count: 3, componentNames: SO,AAI,SDNC scheduling: - enabled: false \ No newline at end of file + enabled: false diff --git a/volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml b/volumes/so/config/bpmn-infra/onapheat/override.yaml similarity index 98% rename from volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml rename to volumes/so/config/bpmn-infra/onapheat/override.yaml index 93ce251..208ab09 100644 --- a/volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml +++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml @@ -218,15 +218,15 @@ appc: service: ueb poolMembers: ueb1.simpledemo.openecomp.org:3904,ueb2.simpledemo.openecomp.org:3904 server: - port: 8080 + port: 8081 tomcat: max-threads: 50 spring: datasource: driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://mariadb:3306/camundabpmn - username: ${DB_USERNAME} - password: ${DB_PASSWORD} + username: camundauser + password: camunda123 dbcp2: initial-size: 5 max-total: 20 @@ -257,4 +257,4 @@ spring: - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: ACTUATOR \ No newline at end of file + role: ACTUATOR diff --git a/volumes/mso/configuration/catalog-db/override-onapheat.yaml b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml similarity index 71% rename from volumes/mso/configuration/catalog-db/override-onapheat.yaml rename to volumes/so/config/catalog-db-adapter/onapheat/override.yaml index d5e6c93..0c51ffa 100644 --- a/volumes/mso/configuration/catalog-db/override-onapheat.yaml +++ b/volumes/so/config/catalog-db-adapter/onapheat/override.yaml @@ -1,16 +1,22 @@ server: - port: 8080 + port: 8082 tomcat: max-threads: 50 ssl-enable: false mso: logPath: logs site-name: onapheat + catalog: + db: + spring: + endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082 + db: + auth: Basic YnBlbDpwYXNzd29yZDEk spring: datasource: - url: jdbc:mariadb://mariadb:3306/requestdb - username: so - password: so123 + url: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 driver-class-name: org.mariadb.jdbc.Driver initialize: false initialization-mode: never @@ -39,7 +45,6 @@ management: flyway: baseline-on-migrate: true - url: jdbc:mariadb:///mariadb:3306/requestdb - user: so - password: so123 - \ No newline at end of file + url: jdbc:mariadb://mariadb:3306/catalogdb + user: cataloguser + password: catalog123 diff --git a/volumes/mso/configuration/openstack-adapter/override-onapheat.yaml b/volumes/so/config/openstack-adapter/onapheat/override.yaml similarity index 98% rename from volumes/mso/configuration/openstack-adapter/override-onapheat.yaml rename to volumes/so/config/openstack-adapter/onapheat/override.yaml index 4092c60..6704415 100644 --- a/volumes/mso/configuration/openstack-adapter/override-onapheat.yaml +++ b/volumes/so/config/openstack-adapter/onapheat/override.yaml @@ -120,4 +120,4 @@ cloud_config: region_id: "DFW" clli: "DFW" aic_version: "2.5" - identity_service_id: "RAX_KEYSTONE" \ No newline at end of file + identity_service_id: "RAX_KEYSTONE" diff --git a/volumes/mso/configuration/request-db/override-onapheat.yaml b/volumes/so/config/request-db-adapter/onapheat/override.yaml similarity index 91% rename from volumes/mso/configuration/request-db/override-onapheat.yaml rename to volumes/so/config/request-db-adapter/onapheat/override.yaml index 1261eb1..d20700f 100644 --- a/volumes/mso/configuration/request-db/override-onapheat.yaml +++ b/volumes/so/config/request-db-adapter/onapheat/override.yaml @@ -11,8 +11,8 @@ mso: spring: datasource: url: jdbc:mariadb://mariadb:3306/requestdb - username: so - password: so123 + username: requestuser + password: request123 driver-class-name: org.mariadb.jdbc.Driver initialize: false initialization-mode: never @@ -42,6 +42,5 @@ management: flyway: baseline-on-migrate: true url: jdbc:mariadb://mariadb:3306/requestdb - user: so - password: so123 - \ No newline at end of file + user: requestuser + password: request123 diff --git a/volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml similarity index 99% rename from volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml rename to volumes/so/config/sdnc-adapter/onapheat/override.yaml index 44a38f2..2ac2062 100644 --- a/volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml +++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml @@ -1,6 +1,6 @@ server: port: 8086 - + mso: async: core-pool-size: 50 @@ -151,4 +151,4 @@ spring: - username: mso_admin password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG' - role: ACTUATOR \ No newline at end of file + role: ACTUATOR diff --git a/volumes/mso/configuration/vfc-adapter/override-onapheat.yml b/volumes/so/config/vfc-adapter/onapheat/override.yaml similarity index 90% rename from volumes/mso/configuration/vfc-adapter/override-onapheat.yml rename to volumes/so/config/vfc-adapter/onapheat/override.yaml index 300cfe8..4471373 100644 --- a/volumes/mso/configuration/vfc-adapter/override-onapheat.yml +++ b/volumes/so/config/vfc-adapter/onapheat/override.yaml @@ -5,8 +5,8 @@ spring: datasource: driver-class-name: org.mariadb.jdbc.Driver url: jdbc:mariadb://mariadb:3306/requestdb - username: so - password: so123 + username: requestuser + password: request123 dbcp2: initial-size: 5 max-total: 20 @@ -14,7 +14,7 @@ spring: test-on-borrow: true server: - port: 8080 + port: 8084 tomcat: max-threads: 50 mso: @@ -32,5 +32,3 @@ management: prometheus: enabled: true # Whether exporting of metrics to Prometheus is enabled. step: 1m # Step size (i.e. reporting frequency) to use. - - -- 2.16.6