Add aai and mso FQDN in drools /etc/hosts

.api.simpledemo.openecomp.org

See https://jira.onap.org/browse/POLICY-510
This is a temporary solution.

Assign a static IP address to aai-service and inject
it in the /etc/hosts of drools.

Change-Id: I52c25225e63be9d9dfb9c92836f2b16da9f2b813
Issue-ID: OOM-549
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index df7e356..bf08070 100644 (file)
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -165,6 +165,7 @@ spec:
   type: NodePort
   selector:
     app: aai-service
+  clusterIP: {{ .Values.aaiServiceClusterIp }}
 #{{ end }}
 #{{ if not .Values.disableAaiModelLoaderService }}
 ---

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index ce625b7..692d071 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -1,6 +1,11 @@
 nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
+
+# POLICY hotfix - Note this must be temporary
+# See https://jira.onap.org/browse/POLICY-510
+aaiServiceClusterIp: 10.43.255.254
+
 image:
   readiness: oomk8s/readiness-check:1.0.0
   aaiProxy: aaionap/haproxy

diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/drools/base.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/drools/base.conf
index 2dd0c3d..4f90444 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/drools/base.conf
+++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/drools/base.conf
@@ -83,13 +83,13 @@ DMAAP_SERVERS=dmaap.onap-message-router
 
 # AAI
 
-AAI_URL=aai-service.onap-aai:8443
+AAI_URL=https://aai.api.simpledemo.openecomp.org:8443
 AAI_USERNAME=POLICY
 AAI_PASSWORD=POLICY
 
 # MSO
 
-SO_URL=mso.onap-mso:8080/ecomp/mso/infra
+SO_URL=http://mso.onap-mso:8080/ecomp/mso/infra
 SO_USERNAME=InfraPortalClient
 SO_PASSWORD=password1$
 

diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index fe52f25..1558b65 100644 (file)
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -43,6 +43,10 @@ spec:
           }
           ]'
     spec:
+      hostAliases:
+      - ip: "{{ .Values.aaiServiceClusterIp }}"
+        hostnames:
+        - "aai.api.simpledemo.openecomp.org"
       containers:
       - image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index ce037d8..f52dc44 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,6 +1,11 @@
 nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
+
+# POLICY hotfix - Note this must be temporary
+# See https://jira.onap.org/browse/POLICY-510
+aaiServiceClusterIp: 10.43.255.254
+
 image:
   readiness: oomk8s/readiness-check
   readinessVersion: 1.0.0