X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-pm-mapper%2Fvalues.yaml;h=da4c6386239987819578b4d4956d3b64a7d63db0;hb=5a7fbeed35622045afb31de494cb42e83f85821b;hp=6099d0cf8530c64a28d39620a7e5aca6593f2c8d;hpb=934fd86be2174eb526dd70669a490e77644701e2;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 6099d0cf85..da4c638623 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -56,7 +56,7 @@ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.pm-mapper:1.8.0
+image: onap/org.onap.dcaegen2.services.pm-mapper:1.9.0
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
@@ -73,16 +73,16 @@ certDirectory: /opt/app/pm-mapper/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:
     containers:
-      - aaf-cm
       - dmaap-bc
       - dmaap-provisioning-job
       - dcae-datafile-collector
+      - message-router
 
 # Probe Configuration
 readiness:
@@ -99,7 +99,7 @@ service:
   name: dcae-pm-mapper
   both_tls_and_plain: true
   ports:
-    - name: https
+    - name: http
       port: 8443
       plain_port: 8081
       port_protocol: http
@@ -130,16 +130,16 @@ credentials:
 
 # Initial Application Configuration
 applicationConfig:
-  enable_tls: true
+  enable_tls: false
   enable_http: true
   aaf_identity: ""
   aaf_password: ""
   pm-mapper-filter: "{ \"filters\":[] }"
-  key_store_path: ""
-  key_store_pass_path: ""
-  trust_store_path: ""
-  trust_store_pass_path: ""
-  dmaap_dr_delete_endpoint: https://dmaap-dr-node:8443/delete
+  key_store_path: /opt/app/pm-mapper/etc/cert/cert.jks
+  key_store_pass_path: /opt/app/pm-mapper/etc/cert/jks.pass
+  trust_store_path: /opt/app/pm-mapper/etc/cert/trust.jks
+  trust_store_pass_path: /opt/app/pm-mapper/etc/cert/trust.pass
+  dmaap_dr_delete_endpoint: http://dmaap-dr-node:8080/delete
   streams_publishes:
     dmaap_publisher:
       type: message_router
@@ -158,7 +158,7 @@ applicationConfig:
         username: ${DR_USERNAME}
         password: ${DR_PASSWORD}
         location: san-francisco
-        delivery_url: https://dcae-pm-mapper:8443/delivery
+        delivery_url: http://dcae-pm-mapper:8081/delivery
 
 # DataRouter Feed Configuration
 drFeedConfig:
@@ -176,20 +176,7 @@ drSubConfig:
     userpwd: ${DR_PASSWORD}
     dcaeLocationName: loc00
     privilegedSubscriber: true
-    deliveryURL: https://dcae-pm-mapper:8443/delivery
-
-# MessageRouter Topic, Publisher Configuration
-mrTopicsConfig:
-  - topicName: PERFORMANCE_MEASUREMENTS
-    topicDescription: PM Mapper publishes perf3gpp VES PM Events to authenticated MR topic
-    owner: dcaecm
-    tnxEnabled: false
-    clients:
-      - dcaeLocationName: san-francisco
-        clientRole: org.onap.dcae.pmPublisher
-        action:
-          - pub
-          - view
+    deliveryURL: http://dcae-pm-mapper:8081/delivery
 
 # ConfigMap Configuration for Dr Feed, Subscriber, MR Topics
 volumes:
@@ -197,8 +184,6 @@ volumes:
     path: /opt/app/config/feeds
   - name: drsub-config
     path: /opt/app/config/dr_subs
-  - name: topics-config
-    path: /opt/app/config/topics
 
 # Resource Limit Flavor -By Default Using Small
 flavor: small