Fix SO aaiEndpoint aai.onap

Issue-ID: OOM-1068
Change-Id: Ibea86d352e439e14d39b484eddf37314c0b8a16e
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index aa3cac7..8276d25 100755
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -19,14 +19,14 @@
       "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
       "camundaURL": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}",
       "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
+      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aai.port}}",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
     },
 
     "mso-asdc-controller-config":
     {
-      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
+      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aai.port}}",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7"
     },
@@ -158,7 +158,7 @@
       "oofTimeout": "PT30M",
       "serviceAgnosticOofHost": "http://{{.Values.config.oof.serviceName}}:{{.Values.config.oof.port}}",
       "serviceAgnosticOofEndpoint": "/api/oof/v1/placement",
-      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
+      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aai.port}}",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "adaptersNamespace": "http://org.openecomp.mso",
       "adaptersCompletemsoprocessEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/CompleteMsoProcess",