Merge "[DCAE] DCAEGEN2-Services Service Mesh Patch"

1 files changed, 8 insertions, 5 deletions

diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index 46002b1651..3fdd251110 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -92,13 +92,13 @@ certDirectory: /opt/app/sliceanalysisms/etc/cert/
 # TLS role -- set to true if microservice acts as server
 # If true, an init container will retrieve a server cert
 # and key from AAF and mount them in certDirectory.
-tlsServer: true
+tlsServer: false
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - aaf-cm
     - &postgresName dcae-sliceanalysisms-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -114,7 +114,7 @@ service:
   type: ClusterIP
   name: dcae-slice-analysis-ms
   ports:
-    - name: https
+    - name: http
       port: 8080
       port_protocol: http
 
@@ -155,8 +155,8 @@ applicationConfig:
   sliceanalysisms.cid: sliceanalysisms-cid
   sliceanalysisms.configDb.service: http://config-db:8080
   sliceanalysisms.configDbEnabled: true
-  sliceanalysisms.aai.url: https://aai.onap.svc.cluster.local:8443/aai/v21
-  sliceanalysisms.cps.url: https://cps:8088
+  sliceanalysisms.aai.url: http://aai-internal.onap.svc.cluster.local:80/aai/v21
+  sliceanalysisms.cps.url: http://cps:8080
   sliceanalysisms.samples: 3
   sliceanalysisms.minPercentageChange: 5
   sliceanalysisms.initialDelaySeconds: 120000
@@ -209,6 +209,9 @@ applicationConfig:
         topic_url: http://message-router:3904/events/AAI-EVENT
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small