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 <rd472p@att.com>

11 files changed, 0 insertions, 1215 deletions

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-new.crt b/volumes/mso/chef-config/onap-ca-new.crt
deleted file mode 100644
index e9a50d7..0000000
--- a/volumes/mso/chef-config/onap-ca-new.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------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.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/configuration/api-handler/override-onapheat.yaml b/volumes/mso/configuration/api-handler/override-onapheat.yaml
deleted file mode 100644
index 03ae5e0..0000000
--- a/volumes/mso/configuration/api-handler/override-onapheat.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-server:
-    port: 8080
-    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 cGFzc3dvcmQxJA==
-  config: 
-    path: /src/main/resources/
-  infra:
-    default:
-      alacarte:
-        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
-        recipeTimeout: 180
-        testApi: VNF_API
-      service:
-        macro:
-          default:
-            testApi: GR_API
-  apih:
-    homing:
-      sdna:
-        url: http://c1.vm1.mso.simpledemo.openecomp.org:8086/
-        password: 4112B789E942B161228F7D5AFC654C0F  
-  bpelURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/
-  bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
-  camundaURL: http://c1.vm1.mso.simpledemo.openecomp.org:8082/
-  camundaAuth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  sdc:
-    client:
-      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
-    activate:
-      instanceid: test
-      userid: cs0008
-    endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:28090
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  tenant:
-    isolation:
-      retry:
-        count: 3
-  aai:
-    endpoint: https://aai.api.simpledemo.onap.org:8443
-    auth: 2630606608347B7124C244AB0FE34F6F
-  so:
-    operational-environment:
-      dmaap:
-        username: testuser
-        password: VjR5NDcxSzA=
-        host: http://c1.vm1.mso.simpledemo.openecomp.org:28090
-      publisher:
-        topic: com.att.ecomp.mso.operationalEnvironmentEvent
-
-spring:
-  datasource:
-    url: jdbc:mariadb://mariadb:3306/catalogdb
-    username: ${MYSQL_ROOT_USERNAME}
-    password: ${MYSQL_ROOT_PASSWORD}
-    driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true 
-
-  jpa:
-      show-sql: true
-      hibernate:
-        dialect: org.hibernate.dialect.MySQL5Dialect
-        ddl-auto: validate
-        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-        enable-lazy-load-no-trans: true
-  jersey:
-    type: filter
-  security:
-    usercredentials:
-    -  
-      username: sitecontrol
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SiteControl-Client 
-    -  
-      username: gui
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: GUI-Client  
-    -  
-      username: infraportal
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: InfraPortal-Client        
-    -  
-      username: bpel
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client   
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR      
-request:
-  datasource:
-    url: jdbc:mariadb://mariadb:3306/requestdb
-    username: ${MYSQL_ROOT_USERNAME}
-    password: ${MYSQL_ROOT_PASSWORD}
-    driver-class-name: org.mariadb.jdbc.Driver  
-    dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true
diff --git a/volumes/mso/configuration/asdc-controller/override-onapheat.yaml b/volumes/mso/configuration/asdc-controller/override-onapheat.yaml
deleted file mode 100644
index d7f8a5b..0000000
--- a/volumes/mso/configuration/asdc-controller/override-onapheat.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
-  port: 8080
-
-spring:
-  security:
-    usercredentials:
-    -  
-      username: asdc
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: Asdc-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
-
-mso:
-  logPath: ./logs/asdc
-  catalog:
-    db:
-      spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
-  db:
-    auth: Basic YnBlbDpwYXNzd29yZDEk
-  site-name: onapheat
-  aai:  
-    endpoint: https://aai.api.simpledemo.onap.org:8443
-  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
-      relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
-      activateServerTLSAuth: false
-      keyStorePassword:  
-      keyStorePath:
-      watchDogTimeout: 60
-      isFitlerInEmptyResources: true
-      messageBusAddress: c2.vm1.sdc.simpledemo.openecomp.org
-  asdc:
-    config:
-      key: 566B754875657232314F5548556D3665
-      components:
-        count: 3,
-        componentNames: SO,AAI,SDNC
-  scheduling:
-    enabled: false
\ No newline at end of file
diff --git a/volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml b/volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml
deleted file mode 100644
index 93ce251..0000000
--- a/volumes/mso/configuration/bpmn-infrastructure/override-onapheat.yml
+++ /dev/null
@@ -1,260 +0,0 @@
-aai:
-  auth: 2630606608347B7124C244AB0FE34F6F
-  dme2:
-    timeout: '30000'
-  endpoint: https://aai.api.simpledemo.onap.org:8443
-camunda:
-  bpm:
-    admin-user:
-      id: admin
-      password: admin
-    history-level: full
-    job-execution:
-      max-pool-size: 30
-      core-pool-size: 3
-entitymanager:
-  packagesToScan: com
-
-mso:
-  correlation:
-    timeout: 60
-  logPath: logs
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-  adapters:
-    completemsoprocess:
-      endpoint:  http://c1.vm1.mso.simpledemo.openecomp.org:8081/CompleteMsoProcess
-    db:
-      auth: 26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
-      password: wLg4sjrAFUS8rfVfdvTXeQ==
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter      
-      spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083
-    network:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/NetworkAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/v1/networks
-    openecomp:
-      db:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/services/RequestsDbAdapter
-    po:
-      auth: 757A94191D685FD2092AC1490730A4FC
-      password: 3141634BF7E070AA289CF2892C986C0B
-    sdnc:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/SDNCAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/rest/v1/sdnc
-      timeout: PT60S
-    tenant:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/TenantAdapter
-    vnf:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/VnfAdapter
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/vnfs/v1/vnfs
-    volume-groups:
-      rest:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/rest/v1/volume-groups
-    vnf-async:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8087/services/VnfAdapterAsync
-  bpmn:
-    process:
-      historyTimeToLive: '30'
-  callbackRetryAttempts: '5'
-  catalog:
-    db:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082/ecomp/mso/catalog
-      spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
-  db:
-    auth: Basic YnBlbDptc28tZGItMTUwNyE=
-  default:
-    adapter:
-      namespace: http://org.openecomp.mso 
-  healthcheck:
-    log:
-      debug: 'false'
-  infra:
-    customer:
-      id: testCustIdInfra
-  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  po:
-    timeout: PT60S  
-  request:
-    db:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8083/
-  rollback: 'true'
-  sdnc:    
-    password: 3141634BF7E070AA289CF2892C986C0B
-  service:
-    agnostic:
-      sniro:
-        endpoint: /sniro/api/v2/placement
-        host: http://c1.vm1.mso.simpledemo.openecomp.org:30253
-  site-name: CamundaEngine
-  sniro:
-    auth: test:testpwd
-    callback: http://c1.vm1.mso.simpledemo.openecomp.org:8086/adapters/rest/SDNCNotify
-    endpoint: http://replaceme:28090/optimizationInstance/V1/create
-    timeout: PT30M  
-  workflow:
-    CreateGenericVNFV1:
-      aai:
-        volume-group:
-          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group   
-    default:
-      aai:
-        version: '8'
-        cloud-region:
-          version: '9'
-        generic-vnf:
-          version: '9'
-        v11:
-          customer:
-            uri: /aai/v11/business/customers/customer
-          generic-query:
-            uri: /aai/v11/search/generic-query
-          generic-vnf:
-            uri: /aai/v11/network/generic-vnfs/generic-vnf
-          l3-network:
-            uri: /aai/v11/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v11/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v11/search/nodes-query
-          route-table-reference:
-            uri: /aai/v11/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-          vce:
-            uri: /aai/v11/network/vces/vce
-          vpn-binding:
-            uri: /aai/v11/network/vpn-bindings/vpn-binding
-        v8:
-          configuration:
-            uri: /aai/v11/network/configurations/configuration
-          customer:
-            uri: /aai/v8/business/customers/customer
-          generic-query:
-            uri: /aai/v8/search/generic-query
-          l3-network:
-            uri: /aai/v8/network/l3-networks/l3-network
-          network-policy:
-            uri: /aai/v8/network/network-policies/network-policy
-          nodes-query:
-            uri: /aai/v8/search/nodes-query
-          route-table-reference:
-            uri: /aai/v8/network/route-table-references/route-table-reference
-          tenant:
-            uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
-          vce:
-            uri: /aai/v8/network/vces/vce
-          vpn-binding:
-            uri: /aai/v8/network/vpn-bindings/vpn-binding
-        v9:
-          cloud-region:
-            uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
-          generic-vnf:
-            uri: /aai/v9/network/generic-vnfs/generic-vnf
-      retry:
-        attempts: '1'
-    deleteCinderVolumeV1:
-      aai:
-        volume-group:
-          uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
-    global:
-      default:
-        aai:
-          namespace: http://org.openecomp.aai.inventory/   
-    message:
-      endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/WorkflowMessage
-    notification:
-      name: GenericNotificationServiceATT
-    sdncadapter:
-      callback: http://c1.vm1.mso.simpledemo.openecomp.org:8086/mso/SDNCAdapterCallbackService
-    vnfadapter:
-      create:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
-      delete:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
-      query:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
-      rollback:
-        callback: http://c1.vm1.mso.simpledemo.openecomp.org:8087/mso/vnfAdapterNotify
-  global:
-    dmaap:
-      username: testuser
-      password: alRyMzJ3NUNeakxl
-      host: http://10.42.111.36:904
-      publisher:
-        topic: replaceme
-policy:
-  auth: Basic dGVzdHBkcDphbHBoYTEyMw==
-  client:
-    auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
-  endpoint: https://localhost:8081/pdp/api/
-  environment: TEST
-sdnc:
-  auth: Basic YWRtaW46YWRtaW4=
-  host: https://localhost:8443
-  path: /restconf/operations/GENERIC-RESOURCE-API
-      
-appc:
-  client:
-    topic:
-      read: 
-        name: APPC-LCM-WRITE
-        timeout: 360000 
-      write: APPC-LCM-READ
-      sdnc:
-        read:
-          name: SDNC-LCM-WRITE          
-        write: SDNC-LCM-READ
-    response:
-      timeout: 360000
-    key: VIlbtVl6YLhNUrtU
-    secret: 64AG2hF4pYeG2pq7CT6XwUOT
-    service: ueb
-    poolMembers: ueb1.simpledemo.openecomp.org:3904,ueb2.simpledemo.openecomp.org:3904
-server:
-  port: 8080
-  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}
-     dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true
-  security:
-    usercredentials:
-    -
-      username: apihBpmn
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPMN-Client
-    -
-      username: sdncaBpmn
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPMN-Client 
-    -
-      username: poBpmn
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPMN-Client
-    -  
-      username: wmaBpmn
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPMN-Client
-    -  
-      username: sniro
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SNIRO-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
\ No newline at end of file
diff --git a/volumes/mso/configuration/catalog-db/override-onapheat.yaml b/volumes/mso/configuration/catalog-db/override-onapheat.yaml
deleted file mode 100644
index d5e6c93..0000000
--- a/volumes/mso/configuration/catalog-db/override-onapheat.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  logPath: logs
-  site-name: onapheat
-spring:
-  datasource:
-    url: jdbc:mariadb://mariadb:3306/requestdb
-    username: so
-    password: so123
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialize: false
-    initialization-mode: never
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
-
-#Actuator
-management: 
-  context-path: /manage
-
-flyway:
-  baseline-on-migrate: true
-  url: jdbc:mariadb:///mariadb:3306/requestdb
-  user: so
-  password: so123
-      
\ No newline at end of file
diff --git a/volumes/mso/configuration/openstack-adapter/override-onapheat.yaml b/volumes/mso/configuration/openstack-adapter/override-onapheat.yaml
deleted file mode 100644
index 4092c60..0000000
--- a/volumes/mso/configuration/openstack-adapter/override-onapheat.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-server:
-  port: 8087
- 
-spring:
-  security:
-    usercredentials:
-    -  
-      username: sdnc
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SDNC-Client
-    -  
-      username: sitecontrol
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SiteControl-Client 
-    -  
-      username: bpel
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client        
-    -  
-      username: sniro
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SNIRO-Client  
-    -  
-      username: apih
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: MSO-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
-
-
-org:
-  onap:
-    so:
-      adapters:
-        default_keystone_url_version: /v2.0
-        default_keystone_reg_ex: "/[vV][0-9]"
-        vnf:
-          bpelauth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
-          checkRequiredParameters: true
-          addGetFilesOnVolumeReq: false
-          sockettimeout: 30
-          connecttimeout: 30
-          retrycount: 5
-          retryinterval: -15
-          retrylist: 408,429,500,502,503,504,900
-          valet_enabled: false
-          fail_requests_on_valet_failure: false
-        network:
-          bpelauth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
-          sockettimeout: 5
-          connecttimeout: 5
-          retrycount: 5
-          retryinterval: -15
-          retrylist: 408,429,500,502,503,504,900
-        tenant: 
-          default_keystone_url_version: /v2.0
-          default_keystone_reg_ex: "/[vV][0-9]"
-          default_tenant_description: Tenant
-          default_region_type: single
-          default_user_role: admin
-          default_success_status_string: Success
-          default_no_regions_status_string: no regions
-          default_quota_value: 10
-          set_default_quota: false
- 
-ecomp:
-  mso:
-    adapters:
-      po:
-        retryCodes: 504
-        retryDelay: 5
-        retryCount: 3
-        pollTimeout: 7500
-        pollInterval: 15
-      
-mso:
-  logPath: ./logs/openstack
-  catalog:
-    db:
-      spring:
-        endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
-  db:
-    auth: Basic YnBlbDptc28tZGItMTUwNyE=
-  site-name: localDevEnv
-  async:
-    core-pool-size: 50
-    max-pool-size: 50
-    queue-capacity: 500
-
-cloud_config:
-  identity_services:
-    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:
-    Dallas:
-      region_id: "DFW"
-      clli: "DFW"
-      aic_version: "2.5"
-      identity_service_id: "RAX_KEYSTONE"
-    Northern Virginia:
-      region_id: "IAD"
-      clli: "IAD"
-      aic_version: "2.5"
-      identity_service_id: "RAX_KEYSTONE"
-    Chicago:
-      region_id: "ORD"
-      clli: "ORD"
-      aic_version: "2.5"
-      identity_service_id: "RAX_KEYSTONE" 
-    DEFAULT:
-      region_id: "DFW"
-      clli: "DFW"
-      aic_version: "2.5"
-      identity_service_id: "RAX_KEYSTONE"
\ No newline at end of file
diff --git a/volumes/mso/configuration/request-db/override-onapheat.yaml b/volumes/mso/configuration/request-db/override-onapheat.yaml
deleted file mode 100644
index 1261eb1..0000000
--- a/volumes/mso/configuration/request-db/override-onapheat.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# will be used as entry in DB to say SITE OFF/ON for healthcheck
-
-server:
-    port: 8083
-    tomcat:
-        max-threads: 50
-ssl-enable: false
-mso:
-  logPath: logs
-  site-name: localSite
-spring:
-  datasource:
-    url: jdbc:mariadb://mariadb:3306/requestdb
-    username: so
-    password: so123
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialize: false
-    initialization-mode: never
-  jpa:
-    generate-ddl: false
-    show-sql: false
-    hibernate:
-      ddl-auto: validate
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      enable-lazy-load-no-trans: true
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  security:
-    usercredentials:
-    -
-      username: bpel
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
-
-#Actuator
-management: 
-  context-path: /manage
-
-flyway:
-  baseline-on-migrate: true
-  url: jdbc:mariadb://mariadb:3306/requestdb
-  user: so
-  password: so123
-      
\ No newline at end of file
diff --git a/volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml b/volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml
deleted file mode 100644
index 44a38f2..0000000
--- a/volumes/mso/configuration/sdnc-adapter/override-onapheat.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-server:
-    port: 8086
-    
-mso:
-    async:
-        core-pool-size: 50
-        max-pool-size: 50
-        queue-capacity: 500
-    logPath: ./logs/sdnc
-    catalog:
-        db:
-          spring:
-            endpoint: http://c1.vm1.mso.simpledemo.openecomp.org:8082
-    db:
-      auth: Basic cGFzc3dvcmQxJA==
-    site-name: onapheat
-org:
-    onap:
-        so:
-            adapters:
-                sdnc:
-                    '.':
-                        put: PUT|60000|sdncurl5|
-                        query: GET|60000|sdncurl2|
-                        restdelete: DELETE|60000|sdncurl5|
-                    '':
-                        contrail-route-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        network-topology-operation:
-                            activate: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            assign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            changeassign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            changedelete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            reserve: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                        port-mirror-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            disable: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            enable: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        security-zone-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        service-homing-operation:
-                            homing: POST|60000|sdncurl3|sdnc-homing-header|com:att:sdnctl:aicHoming
-                        service-topology-operation:
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            rollback: POST|270000|sdncur10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        svc-topology-operation:
-                            activate: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-                            assign: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-                            delete: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
-                        vnf-topology-operation:
-                            activate: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            assign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            changeassign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            changedelete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            delete: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                            rollback: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
-                    bpelauth: cGFzc3dvcmQxJA==
-                    bpelurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/SDNCAdapterCallbackService
-                    generic-resource:
-                        network-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        vf-module-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            changeassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            changedelete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            rollback: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                        vnf-topology-operation:
-                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            changeassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            changedelete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            rollback: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
-                    infra:
-                        '':
-                            query: GET|60000|sdncurl5|
-                    mobility:
-                        '':
-                            query: GET|60000|sdncurl5|
-                    myurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/adapters/rest/SDNCNotify
-                    rest:
-                        bpelurl: http://c1.vm1.mso.simpledemo.openecomp.org:8081/mso/WorkflowMessage
-                    sdncauth: 406B2AE613211B6FB52466DE6E1769AC
-                    sdncconnecttime: 5000
-                    sdncurl10: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/GENERIC-RESOURCE-API:'
-                    sdncurl11: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNFTOPOLOGYAIC-API:'
-                    sdncurl12: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/
-                    sdncurl5: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config
-                    sdncurl6: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/VNF-API:'
-                    sdncurl8: 'http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NBNC-API:'
-                    sdncurl9: http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/operations/NORTHBOUND-API:service-topology-operation
-                    service:                  
-                        infra:
-                            service-topology-infra-activate-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-                            service-topology-infra-assign-operation: POST|120000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-                            service-topology-infra-delete-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1
-                            service-topology-infra-release-operation: POST|90000|sdncurl9|sdnc-request-header|com:att:sdnctl:northbound-api:v1                       
-                    vfmodule:
-                        '':
-                            query: GET|60000|sdncurl12|
-
-spring:  
-  security:
-    usercredentials:
-    -  
-      username: sdnc
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SDNC-Client
-    -  
-      username: sitecontrol
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SiteControl-Client
-    -  
-      username: bpel
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: BPEL-Client
-    -  
-      username: sniro
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: SNIRO-Client
-    -  
-      username: apih
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: MSO-Client
-    -  
-      username: mso_admin
-      password: '$2b$10$byoF5q.VngZd8nj63q2Rm.bbAGUQrNG3DliPtc5l9nJIbXpXyCfrG'
-      role: ACTUATOR
\ No newline at end of file
diff --git a/volumes/mso/configuration/vfc-adapter/override-onapheat.yml b/volumes/mso/configuration/vfc-adapter/override-onapheat.yml
deleted file mode 100644
index 300cfe8..0000000
--- a/volumes/mso/configuration/vfc-adapter/override-onapheat.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-logging:
-  path: logs
-
-spring: 
-  datasource:
-     driver-class-name: org.mariadb.jdbc.Driver 
-     url: jdbc:mariadb://mariadb:3306/requestdb
-     username: so
-     password: so123
-     dbcp2: 
-      initial-size: 5
-      max-total: 20 
-      validation-query: select 1
-      test-on-borrow: true
-
-server:
-    port: 8080
-    tomcat:
-        max-threads: 50
-mso:
-  site-name: localSite
-
-#Actuator
-management:
-  security:
-    enabled: false
-    basic:
-      enabled: false
-  metrics:
-    se-global-registry: false
-    export:
-      prometheus:
-        enabled: true # Whether exporting of metrics to Prometheus is enabled.
-        step: 1m # Step size (i.e. reporting frequency) to use.
-
-