Merge "[Common] Use global storage templates for PVC"

[oom.git] / kubernetes / oof / values.yaml

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index da69c42..e540aa0 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -21,12 +21,13 @@ global:
   readinessImage: readiness-check:2.0.0
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
+  persistence: {}
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-osdf:1.2.1
+image: onap/optf-osdf:1.3.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -36,7 +37,7 @@ debugEnabled: false
 config:
   msbgateway: msb-iag
   msbPort: 80
-  placementVersioningEnabled: False
+  placementVersioningEnabled: True
   # Placement API latest version numbers to be set in HTTP header
   placementMajorVersion: "1"
   placementMinorVersion: "0"
@@ -49,7 +50,7 @@ config:
   soUsername: ""   # SO username for call back.
   soPassword: ""   # SO password for call back.
   # Url and credentials for Conductor.
-  conductorUrl: http://oof-has-api:8091/v1/plans/
+  conductorUrl: https://oof-has-api:8091/v1/plans/
   conductorUsername: admin1
   conductorPassword: plan.15
   conductorPingWaitTime: 60
@@ -57,7 +58,7 @@ config:
   # versions to be set in HTTP header
   conductorMinorVersion: 0
   # Url and credentials for the Policy Platform
-  policyPlatformUrl: http://pdp:8081/pdp/api/getConfig # Policy Dev platform URL
+  policyPlatformUrl: https://pdp:8081/pdp/api/getConfig # Policy Dev platform URL
   policyPlatformEnv: TEST # Environment for policy platform
   policyPlatformUsername: testpdp # Policy platform username.
   policyPlatformPassword: alpha123 # Policy platform password.
@@ -87,12 +88,14 @@ config:
   osdfCMSchedulerPassword: testpwd1
   #AAF Authentication
   is_aaf_enabled: False
-  aaf_cache_expiry_hrs: 3
+  aaf_cache_expiry_mins: 5
   aaf_url: https://aaf-service:8100
   aaf_user_roles:
-      - '/api/oof/v1/placement:org.onap.osdf.access|*|read ALL'
+      - '/placement:org.onap.oof.access|*|read ALL'
+      - '/pci:org.onap.oof.access|*|read ALL'
   # Secret Management Service from AAF
-  aaf_sms_url: https://aaf-sms:10443
+  aaf_sms_url: https://aaf-sms
+  aaf_sms_port: 10443
   aaf_sms_timeout: 30
   secret_domain: osdf
   aaf_ca_certs: /opt/app/ssl_cert/aaf_root_ca.cer
@@ -118,15 +121,15 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      memory: 2Gi
+      cpu: 1000m
     requests:
       memory: 1Gi
       cpu: 500m
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      memory: 4Gi
+      cpu: 2000m
     requests:
       memory: 2Gi
       cpu: 1000m
@@ -149,3 +152,9 @@ service:
   nodePort: 48
 ingress:
   enabled: false
+  service:
+    - baseaddr: "oofosdf"
+      name: "oof-osdf"
+      port: 8698
+  config:
+    ssl: "none"
\ No newline at end of file