1 files changed, 135 insertions, 129 deletions
diff --git a/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json b/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
index 1b6d7084af..1b28858ac9 100755
--- a/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
+++ b/kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
@@ -1,97 +1,123 @@
 {
+  "name": "mso-docker",
+  "description": "MSO Docker Images",
   "chef_type": "environment",
-  "cookbook_versions": {
-    "mso-config": "~> 1.0.0"
-  },
-  "default_attributes": {
-    "asdc-connections": {
-      "asdc-controller1": {
-        "activateServerTLSAuth": "false",
-        "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
+  "json_class": "Chef::Environment",
+  "default_attributes":
+  {
+    "mso_config_path": "/etc/mso/config.d/",
+
+    "mso-api-handler-infra-config":
+    {
+      "bpelURL": "http://mso.onap-mso.svc.cluster.local:8080",
+      "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
+      "camundaURL": "http://mso.onap-mso.svc.cluster.local:8080",
+      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+    },
+
+    "asdc-connections":
+    {
+      "asdc-controller1":
+      {
+        "user": "mso",
         "consumerGroup": "sdc-OpenSource-Env1",
         "consumerId": "sdc-COpenSource-Env11",
         "environmentName": "DMAAP_TOPIC_HERE",
-        "keyStorePassword": "",
-        "keyStorePath": "",
+        "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
         "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
         "pollingInterval": 60,
         "pollingTimeout": 60,
         "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
-        "user": "mso"
+        "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": {
-      "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
-      "bpelURL": "http://mso:8080",
-      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "camundaURL": "http://mso:8080"
+
+    "mso-sdnc-adapter-config":
+    {
+      "sdncurls":
+      [
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
+      ],
+
+      "bpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
+      "restbpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
+      "myurl": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify",
+      "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
+      "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+      "sdncconnecttime": "5000"
     },
-    "mso-bpmn-config": {
+    "mso-po-adapter-config":
+    {
+      "identity_services":
+      [
+        {
+          "dcp_clli": "DEFAULT_KEYSTONE",
+          "identity_url": "OPENSTACK_KEYSTONE_IP_HERE/v2.0",
+          "mso_id": "OPENSTACK_USERNAME_HERE",
+          "mso_pass": "OPENSTACK_ENCRYPTED_PASSWORD_HERE",
+          "admin_tenant": "OPENSTACK_SERVICE_TENANT_NAME_HERE",
+          "member_role": "admin",
+          "tenant_metadata": "true",
+          "identity_server_type": "KEYSTONE",
+          "identity_authentication_type": "USERNAME_PASSWORD"
+        }
+      ],
+
+      "cloud_sites":
+      [
+        {
+          "id": "OPENSTACK_REGION_HERE",
+          "aic_version": "2.5",
+          "lcp_clli": "OPENSTACK_REGION_HERE",
+          "region_id": "OPENSTACK_REGION_HERE",
+          "identity_service_id": "DEFAULT_KEYSTONE"
+        }
+      ],
+
+      "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+      "checkrequiredparameters": "true",
+      "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+    },
+
+    "mso-bpmn-config":
+    {
       "urnFileSystemLoadingEnabled": "true"
     },
-    "mso-bpmn-urn-config": {
-      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
-      "aaiEndpoint": "https://aai-service.onap-aai.svc.cluster.local:8443",
-      "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
-      "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
-      "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog",
-      "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter",
-      "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks",
-      "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-      "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
-      "adaptersSdncRestEndpoint": "http://mso:8080/adapters/rest/v1/sdnc",
-      "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
-      "adaptersVnfAsyncEndpoint": "http://mso:8080/vnfs/VnfAdapterAsync",
-      "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs",
-      "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-      "workflowMessageEndpoint": "http://mso:8080/mso/WorkflowMessage",
-      "workflowSdncAdapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-      "callbackRetryAttempts": "30",
-      "callbackRetrySleepTime": "1000",
-      "logDebugAsyncQueryAAICustomer": "false",
-      "logDebugChangeFeatureActivateV1": "false",
-      "logDebugChangeLayer3ServiceActivateV1": "false",
-      "logDebugChangeLayer3ServiceProvV1": "false",
-      "logDebugCompleteMsoProcess": "false",
-      "logDebugCreateCinderVolumeV1": "false",
-      "logDebugCreateCustomerV1": "false",
-      "logDebugCreateNetworkInstanceInfra": "false",
-      "logDebugCreateNetworkV1": "false",
-      "logDebugCreateServiceInstanceInfra": "false",
-      "logDebugCreateTenantV1": "false",
-      "logDebugCreateVfModuleVolumeInfraV1": "false",
-      "logDebugDeleteCinderVolumeV1": "false",
-      "logDebugDeleteGenericVNFV1": "false",
-      "logDebugDeleteNetworkInstanceInfra": "false",
-      "logDebugDeleteNetworkV1": "false",
-      "logDebugDeleteServiceInstanceInfra": "false",
-      "logDebugDeleteTenantV1": "false",
-      "logDebugDeleteVCEV1": "false",
-      "logDebugDeleteVfModuleVolumeInfraV1": "false",
-      "logDebugDisconnectLayer3Service": "false",
-      "logDebugGetLayer3ServiceDetailsV1": "false",
-      "logDebugL3ToHigherLayerAddBonding": "false",
-      "logDebugL3ToHigherLayerDeleteBonding": "false",
-      "logDebugLayer3ServiceActivateV1": "false",
-      "logDebugLayer3TestAndTurnUpV1": "false",
-      "logDebugQueryAAICustomer": "false",
-      "logDebugQueryTenantInfo": "false",
-      "logDebugRemoveLayer3Service": "false",
-      "logDebugSdncAdapter": "false",
-      "logDebugUpdateCinderVolumeV1": "false",
-      "logDebugUpdateNetworkInstanceInfra": "false",
-      "logDebugUpdateNetworkV2": "false",
-      "logDebugUpdateVfModuleVolumeInfraV1": "true",
-      "logDebugVnfAdapterCreateV1": "true",
-      "logDebugVnfAdapterDeleteV1": "true",
-      "logDebugVnfAdapterQueryV1": "true",
-      "logDebugVnfAdapterRollbackV1": "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",
-      "sniroCallback": "https://mso:8080/adapters/rest/SDNCNotify/SNIROResponse",
+      "sniroCallback": "https://mso.onap-mso.svc.cluster.local: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",
@@ -99,66 +125,46 @@
       "mso.sniro.endpoint": "/optimizationInstance/V1/create",
       "mso.sniro.callback": "/adapters/rest/SDNCNotify/SNIROResponse",
       "mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+      "aaiEndpoint": "https://aai-service.onap-aai.svc.cluster.local:8443",
+      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+      "adaptersNamespace": "http://org.openecomp.mso",
+      "adaptersCompletemsoprocessEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/CompleteMsoProcess",
+      "adaptersDbEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/dbadapters/RequestsDbAdapter",
+      "catalogDbEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/ecomp/mso/catalog",
+      "adaptersSdncEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/adapters/SDNCAdapter",
+      "adaptersSdncRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/v1/sdnc",
+      "adaptersTenantEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/tenants/TenantAdapter",
+      "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "workflowMessageEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
+      "workflowSdncAdapterCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
-      "poTimeout": "PT5M",
+      "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "sdncTimeout": "PT5M",
       "rollback": "true",
+      "adaptersNetworkEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/networks/NetworkAdapter",
+      "adaptersNetworkRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/networks/rest/v1/networks",
+      "adaptersVnfAsyncEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/vnfs/VnfAdapterAsync",
+      "workflowVnfAdapterDeleteCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
+      "workflowVnfAdapterCreateCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
+      "adaptersVnfRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/vnfs/rest/v1/vnfs",
+      "workflowVnfAdapterRestCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterRestNotify",
+      "poTimeout": "PT5M",
       "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
       "sdncFirewallYangModelVersion": "2015-05-15",
-      "sdncTimeout": "PT5M",
       "sdncTimeoutFirewall": "20",
-      "workflowSdncadapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-      "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify",
-      "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify",
-      "workflowVnfAdapterRestCallback": "http://mso:8080/mso/vnfAdapterRestNotify",
+      "callbackRetryAttempts": "30",
+      "callbackRetrySleepTime": "1000",
       "workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
       "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0"
-    },
-    "mso-po-adapter-config": {
-      "checkrequiredparameters": "true",
-      "cloud_sites": [{
-        "aic_version": "2.5",
-        "id": "OPENSTACK_REGION_HERE",
-        "identity_service_id": "DEFAULT_KEYSTONE",
-        "lcp_clli": "OPENSTACK_REGION_HERE",
-        "region_id": "OPENSTACK_REGION_HERE"
-      }],
-      "identity_services": [{
-        "admin_tenant": "OPENSTACK_SERVICE_TENANT_NAME_HERE",
-        "dcp_clli": "DEFAULT_KEYSTONE",
-        "identity_authentication_type": "USERNAME_PASSWORD",
-        "identity_server_type": "KEYSTONE",
-        "identity_url": "OPENSTACK_KEYSTONE_IP_HERE/v2.0",
-        "member_role": "admin",
-        "mso_id": "OPENSTACK_USERNAME_HERE",
-        "mso_pass": "OPENSTACK_ENCRYPTED_PASSWORD_HERE",
-        "tenant_metadata": "true"
-      }],
-      "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
-    },
-    "mso-sdnc-adapter-config": {
-      "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "bpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
-      "restbpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
-      "myurl": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify",
-      "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
-      "sdncconnecttime": "5000",
-      "sdncurls": [
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
-      ]
-    },
-    "mso_config_path": "/etc/mso/config.d/"
+    }
   },
-  "description": "MSO Docker Images",
-  "json_class": "Chef::Environment",
-  "name": "mso-docker",
-  "override_attributes": {}
+
+  "override_attributes":
+  {
+  },
+
+  "cookbook_versions":
+  {
+    "mso-config": "~> 1.0.0"
+  }
 }