summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxg353y <xg353y@intl.att.com>2017-04-12 13:28:49 +0200
committerxg353y <xg353y@intl.att.com>2017-04-12 13:28:49 +0200
commit32f9242c57eed0854f42d2e403258528b4d11198 (patch)
treeb25e14cb0ba6534072ee696f048e68e0750a1ecc
parent7a9e44a11f980da7faaa87ca15173ff4c70f0d3d (diff)
[MSO-8] Bring 1707 changes
Remove individual BPMN debug log configuration parameters, replacing by a single debug parameter. Change-Id: Id75ed8d33c4f6c42956b0e4e7631dd230b90e77a Signed-off-by: xg353y <xg353y@intl.att.com>
-rw-r--r--environments/mso-docker.json364
1 files changed, 150 insertions, 214 deletions
diff --git a/environments/mso-docker.json b/environments/mso-docker.json
index 6cc9a23..b4ca995 100644
--- a/environments/mso-docker.json
+++ b/environments/mso-docker.json
@@ -1,225 +1,169 @@
{
- "name": "mso-docker",
- "description": "MSO Docker Images",
- "chef_type": "environment",
- "json_class": "Chef::Environment",
- "default_attributes":
+ "name": "mso-docker",
+ "description": "MSO Docker Images",
+ "chef_type": "environment",
+ "json_class": "Chef::Environment",
+ "default_attributes":
+ {
+ "mso_config_path": "/etc/mso/config.d/",
+
+ "mso-api-handler-infra-config":
{
- "mso_config_path": "/etc/mso/config.d/",
+ "bpelURL": "http://mso:8080",
+ "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
+ "camundaURL": "http://mso:8080",
+ "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+ },
+
+ "asdc-connections":
+ {
+ "asdc-controller1":
+ {
+ "user": "user",
+ "consumerGroup": "mso",
+ "consumerId": "mso",
+ "environmentName": "PROD",
+ "asdcAddress": "asdc_hostname1:8443",
+ "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
+ "pollingInterval": 60,
+ "pollingTimeout": 60,
+ "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-api-handler-infra-config":
+ "mso-sdnc-adapter-config":
+ {
+ "sdncurls":
+ [
+ "https://localhost:8443/restconf/operations/L3SDN-API:",
+ "https://localhost:8443/restconf/config/L3SDN-API:",
+ "https://localhost:8443/restconf/operations/Firewall-API:",
+ "https://localhost:8443/restconf/config",
+ "https://localhost:8443/restconf/operations/VNF-API:",
+ "https://localhost:8443/restconf/operations/NBNC-API:",
+ "https://localhost:8443/restconf/operations/NORTHBOUND-API:service-topology-operation",
+ "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:",
+ "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:"
+ ],
+
+ "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService",
+ "restbpelurl": "http://mso:8080/mso/WorkflowMessage",
+ "myurl": "http://mso:8080/adapters/rest/SDNCNotify",
+ "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
+ "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+ "sdncconnecttime": "5000"
+ },
+
+ "mso-po-adapter-config":
+ {
+ "identity_services":
+ [
{
- "bpelURL": "http://mso:8080",
- "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
- "camundaURL": "http://mso:8080",
- "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+ "dcp_clli": "RAX_KEYSTONE",
+ "identity_url": "https://identity.api.rackspacecloud.com/v2.0",
+ "mso_id": "PUT_YOUR_TENANT_ID_HERE",
+ "mso_pass": "ENCRYPT_YOUR_API_KEY_HERE",
+ "admin_tenant": "service",
+ "member_role": "admin",
+ "tenant_metadata": "true",
+ "identity_server_type": "KEYSTONE",
+ "identity_authentication_type": "RACKSPACE_APIKEY"
},
- "asdc-connections":
{
- "asdc-controller1":
- {
- "user": "user",
- "consumerGroup": "mso",
- "consumerId": "mso",
- "environmentName": "PROD",
- "asdcAddress": "asdc_hostname1:8443",
- "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
- "pollingInterval": 60,
- "pollingTimeout": 60,
- "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": ""
- }
+ "dcp_clli": "MT_KEYSTONE2",
+ "identity_url": "https://localhost:5000/v2.0",
+ "mso_id": "PUT_YOUR_USER_NAME_HERE",
+ "mso_pass": "ENCRYPT_YOUR_PASSWORD_HERE",
+ "admin_tenant": "service",
+ "member_role": "admin",
+ "tenant_metadata": "true",
+ "identity_server_type": "KEYSTONE",
+ "identity_authentication_type": "USERNAME_PASSWORD"
},
- "mso-sdnc-adapter-config":
{
- "sdncurls":
- [
- "https://localhost:8443/restconf/operations/L3SDN-API:",
- "https://localhost:8443/restconf/config/L3SDN-API:",
- "https://localhost:8443/restconf/operations/Firewall-API:",
- "https://localhost:8443/restconf/config",
- "https://localhost:8443/restconf/operations/VNF-API:",
- "https://localhost:8443/restconf/operations/NBNC-API:",
- "https://localhost:8443/restconf/operations/NORTHBOUND-API:service-topology-operation",
- "https://localhost:8443/restconf/operations/GENERIC-RESOURCE-API:",
- "https://localhost:8443/restconf/operations/VNFTOPOLOGYAIC-API:"
- ],
-
- "bpelurl": "http://mso:8080/mso/SDNCAdapterCallbackService",
- "restbpelurl": "http://mso:8080/mso/WorkflowMessage",
- "myurl": "http://mso:8080/adapters/rest/SDNCNotify",
- "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
- "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
- "sdncconnecttime": "5000"
+ "id": "MT2",
+ "aic_version": "2.5",
+ "lcp_clli": "MT2",
+ "region_id": "lcp_region",
+ "identity_service_id": "MT_KEYSTONE2"
+ }
+ ],
+
+ "cloud_sites":
+ [
+ {
+ "id": "Dallas",
+ "aic_version": "2.5",
+ "lcp_clli": "DFW",
+ "region_id": "DFW",
+ "identity_service_id": "RAX_KEYSTONE"
},
- "mso-po-adapter-config":
{
- "identity_services":
- [
- {
- "dcp_clli": "RAX_KEYSTONE",
- "identity_url": "https://identity.api.rackspacecloud.com/v2.0",
- "mso_id": "PUT_YOUR_TENANT_ID_HERE",
- "mso_pass": "ENCRYPT_YOUR_API_KEY_HERE",
- "admin_tenant": "service",
- "member_role": "admin",
- "tenant_metadata": "true",
- "identity_server_type": "KEYSTONE",
- "identity_authentication_type": "RACKSPACE_APIKEY"
- },
-
- {
- "dcp_clli": "MT_KEYSTONE2",
- "identity_url": "https://localhost:5000/v2.0",
- "mso_id": "PUT_YOUR_USER_NAME_HERE",
- "mso_pass": "ENCRYPT_YOUR_PASSWORD_HERE",
- "admin_tenant": "service",
- "member_role": "admin",
- "tenant_metadata": "true",
- "identity_server_type": "KEYSTONE",
- "identity_authentication_type": "USERNAME_PASSWORD"
- },
-
- {
- "id": "MT2",
- "aic_version": "2.5",
- "lcp_clli": "MT2",
- "region_id": "lcp_region",
- "identity_service_id": "MT_KEYSTONE2"
- }
- ],
-
- "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"
+ "id": "Northern Virginia",
+ "aic_version": "2.5",
+ "lcp_clli": "IAD",
+ "region_id": "IAD",
+ "identity_service_id": "RAX_KEYSTONE"
},
- "mso-bpmn-config":
{
- "urnFileSystemLoadingEnabled": "true"
- },
+ "id": "Chicago",
+ "aic_version": "2.5",
+ "lcp_clli": "ORD",
+ "region_id": "ORD",
+ "identity_service_id": "RAX_KEYSTONE"
+ }
+ ],
+
+ "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+ "checkrequiredparameters": "true",
+ "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+ },
+
+ "mso-bpmn-config":
+ {
+ "urnFileSystemLoadingEnabled": "true"
+ },
"mso-bpmn-urn-config": {
- "logDebugAsyncQueryAAICustomer": "false",
- "logDebugChangeFeatureActivateV1": "false",
- "logDebugChangeLayer3ServiceActivateV1": "false",
- "logDebugChangeLayer3ServiceProvV1": "false",
- "logDebugCompleteMsoProcess": "false",
- "logDebugCreateCustomerV1": "false",
- "logDebugCreateTenantV1": "false",
- "logDebugDeleteNetworkV1": "false",
- "logDebugDeleteTenantV1": "false",
- "logDebugDeleteVCEV1": "false",
- "logDebugGetLayer3ServiceDetailsV1": "false",
- "logDebugL3ToHigherLayerAddBonding": "false",
- "logDebugL3ToHigherLayerDeleteBonding": "false",
+ "debug":"false",
"invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc",
"versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
- "logDebugLayer3ServiceActivateV1": "false",
- "logDebugQueryAAICustomer": "false",
- "logDebugQueryTenantInfo": "false",
- "logDebugSdncAdapter": "false",
- "logDebugUCPEDeleteTenantV1": "false",
- "logDebugUCPEVnfTurnup": "false",
- "logDebugVnfAdapterCreateV1": "false",
- "logDebugVnfAdapterDeleteV1": "false",
- "logDebugRemoveLayer3Service": "false",
- "logDebugLayer3TestAndTurnUpV1": "false",
- "logDebugVnfAdapterRollbackV1": "false",
- "logDebugVnfAdapterQueryV1": "false",
- "logDebugCreateNetworkV1": "false",
- "logDebugcreateCinderVolumeV1": "false",
- "logDebugdeleteCinderVolumeV1": "false",
- "logDebugupdateCinderVolumeV1": "false",
- "logDebugDeleteGenericVNFV1": "false",
- "logDebugDisconnectLayer3Service": "false",
- "logDebugCreateNetworkV2": "false",
- "logDebugDeleteNetworkV2": "false",
- "logDebugCreateVfModuleVolume": "false",
- "logDebugDeleteVfModuleVolume": "false",
- "logDebugUpdateVfModuleVolume": "false",
- "logDebugCreateVfModuleVolumeInfraV1": "false",
- "logDebugDeleteVfModuleVolumeInfraV1": "false",
- "logDebugUpdateVfModuleVolumeInfraV1": "false",
- "logDebugCreateServiceInstanceInfra": "false",
- "logDebugDeleteServiceInstanceInfra": "false",
- "logDebugCreateNetworkInstanceInfra": "false",
- "logDebugDeleteNetworkInstanceInfra": "false",
- "logDebugUpdateNetworkInstanceInfra": "false",
- "logDebugCreateNetworkInstance": "false",
- "logDebugDoCreateNetworkInstance": "false",
- "logDebugDoCreateNetworkInstanceRollback": "false",
- "logDebugDeleteNetworkInstance": "false",
- "logDebugDoDeleteNetworkInstance": "false",
- "logDebugDoDeleteNetworkInstanceRollback": "false",
- "logDebugCreateViprAtmService": "false",
- "logDebugDeleteViprAtmService": "false",
- "logDebugGenericGetService": "false",
- "logDebugGenericPutService": "false",
- "logDebugGenericDeleteService": "false",
- "logDebugCreateServiceInstance": "false",
- "logDebugDelServiceInstance": "false",
- "logDebugRollbackServiceInstance": "false",
- "logDebugDoCreateServiceInstanceRollback": "false",
- "logDebugDoDeleteServiceInstance": "false",
- "logDebugDoCreateVfModuleVolumeRollback": "false",
- "logDebugDoDeleteVfModuleVolumeRollback": "false",
- "logDebugDoDeleteVfModuleVolumeV1": "false",
- "logDebugDoCreateVfModuleVolumeV1": "false",
+ "sniroAuth": "test:testpwd",
+ "sniroCallback": "https://mso:8080/adapters/rest/SDNCNotify/SNIROResponse",
+ "sniroEndpoint": "https://TODO.att.c om:14699/sniro/api/v1/placement",
+ "sniroTimeout": "PT30M",
+ "sniroPoliciesDHV2vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1",
+ "sniroPoliciesDHV4vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1",
"mso.sniro.endpoint": "/optimizationInstance/V1/create",
"mso.sniro.callback": "/adapters/rest/SDNCNotify/SNIROResponse",
"mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77",
"aaiEndpoint": "https://c1.vm1.aai.simpledemo.openecomp.org:8443",
"adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
"adaptersDbEndpoint": "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",
@@ -243,24 +187,16 @@
"callbackRetryAttempts": "30",
"callbackRetrySleepTime": "1000",
"workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
- "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0",
- "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
- "sniroAuth": "test:testpwd",
- "sniroCallback": "https://mso:8443/adapters/rest/SDNCNotify/SNIROResponse",
- "sniroEndpoint": "https://TODO.att.com:14699/sniro/api/v1/placement",
- "sniroTimeout": "PT30M",
- "sniroPoliciesDHV2vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1",
- "sniroPoliciesDHV4vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.VNFPolicy_vvigprimary2_v1,SNIRO.VNFPolicy_vvigsecondary2_v1,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1",
- "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog"
- }
- },
+ "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0"
+ }
+ },
- "override_attributes":
- {
- },
+ "override_attributes":
+ {
+ },
- "cookbook_versions":
- {
- "mso-config": "~> 1.0.0"
- }
+ "cookbook_versions":
+ {
+ "mso-config": "~> 1.0.0"
+ }
} \ No newline at end of file