Merge "AAI endpoint config in mso-docker.json"

diff --combined volumes/mso/chef-config/mso-docker.json
index 5d3b56a,052b27d..89a5d43
--- 1/volumes/mso/chef-config/mso-docker.json
--- 2/volumes/mso/chef-config/mso-docker.json
+++ b/volumes/mso/chef-config/mso-docker.json
@@@ -18,12 -18,17 +18,17 @@@
        "bpelURL": "http://mso:8080",
        "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
        "camundaURL": "http://mso:8080",
-       "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+       "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+       "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
+       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
      },
  
      "mso-asdc-controller-config":
      {
-       "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443"
+       "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
+       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
      },
  
      "asdc-connections":
@@@ -177,11 -182,6 +182,11 @@@
        "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:8080/api/oof/v1/placement",
 +      "oofTimeout": "PT30M",
 +      "serviceAgnosticOofHost": "http://oof.api.simpledemo.openecomp.org:8080",
 +      "serviceAgnosticOofEndpoint": "/api/oof/v1/placement",
        "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
        "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
        "adaptersNamespace": "http://org.openecomp.mso",