diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-01-05 15:22:50 -0500 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-01-16 16:06:30 -0500 |
| commit | 78a30170f4cb78b708fa7417fb66b95dbb3dfd51 (patch) | |
| tree | 0ee34c3e81192054a14da87c9ac35116125e1170 | |
| parent | ccb051441f45e5cf7ee4fa8e59726e794741a2c9 (diff) | |
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>
| -rw-r--r-- | kubernetes/aai/templates/all-services.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/aai/values.yaml | 5 | ||||
| -rwxr-xr-x | kubernetes/config/docker/init/src/config/policy/opt/policy/config/drools/base.conf | 4 | ||||
| -rw-r--r-- | kubernetes/policy/templates/dep-drools.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/policy/values.yaml | 5 |
5 files changed, 17 insertions, 2 deletions
diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index df7e3567d0..bf080704a2 100644 --- 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 ce625b7ab3..692d071d10 100644 --- 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 2dd0c3d508..4f904444f7 100755 --- 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 fe52f25708..1558b65d18 100644 --- 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 ce037d896d..f52dc445e6 100644 --- 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 |