X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fvalues.yaml;h=bce02d42b121668126d831cecec92a7d53e9d017;hb=b1ee058f941a9c9ff27467054d98b8a56c988797;hp=c249f265694946f0cb11f3bf67c76baa251b62d6;hpb=619b97b5b538b39b49bdff75e717c6e245bb4324;p=oom.git

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index c249f26569..bce02d42b1 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -17,16 +17,29 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: onap/oom/readiness:3.0.1
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
+  persistence: {}
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: oof-onap-certs
+    name: &oof-certs '{{ include "common.release" . }}-oof-onap-certs'
+    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
+    type: generic
+    filePaths:
+      - resources/config/certs/intermediate_root_ca.pem
+      - resources/config/certs/aaf_root_ca.cer
+
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/optf-osdf:1.2.1
+image: onap/optf-osdf:3.0.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -36,60 +49,96 @@ debugEnabled: false
 config:
   msbgateway: msb-iag
   msbPort: 80
-  # Credentials for the OOF placement service – SO.
-  osdfPlacementSOUsername: so_test
-  osdfPlacementSOPassword: so_testpwd
-  # Credentials for the OOF CM scheduling service – Generic.
-  osdfCMSchedulerUsername: test1
-  osdfCMSchedulerPassword: testpwd1
-  # Credentials of the callback url for SO.
-  soUsername: ""   # SO username for call back.
-  soPassword: ""   # SO password for call back.
+  placementVersioningEnabled: True
+  # Placement API latest version numbers to be set in HTTP header
+  placementMajorVersion: "1"
+  placementMinorVersion: "0"
+  placementPatchVersion: "0"
+  # Placement API default version numbers to be set in HTTP header
+  placementDefaultMajorVersion: "1"
+  placementDefaultMinorVersion: "0"
+  placementDefaultPatchVersion: "0"
+
   # Url and credentials for Conductor.
-  conductorUrl: http://oof-has-api:8091/v1/plans/
-  conductorUsername: admin1
-  conductorPassword: plan.15
-  conductorPingWaitTime: 60
+  conductorUrl: https://oof-has-api:8091/v1/plans/
+  conductorPingWaitTime: 10
   conductorMaxRetries: 30
+  # 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://policy-xacml-pdp:6969/policy/pdpx/v1/decision  # Policy Dev platform URL
   policyPlatformEnv: TEST # Environment for policy platform
-  policyPlatformUsername: testpdp # Policy platform username.
-  policyPlatformPassword: alpha123 # Policy platform password.
-  policyClientUsername: python # For use with ClientAuth
-  policyClientPassword: test # For use with ClientAuth
   # Credentials for the message reader - A placeholder.
   messageReaderHosts: NA
   messageReaderTopic: NA
-  messageReaderAafUserId: NA
-  messageReaderAafPassword: NA
   # Credentials for the SDC interface - A placeholder.
   sdcUrl: NA
-  sdcUsername: NA
-  sdcPassword: NA
   sdcONAPInstanceID: NA
-  # Credentials for the placement service – Generic.
-  osdfPlacementUsername: "test"
-  osdfPlacementPassword: "testpwd"
+  #AAF Authentication
+  is_aaf_enabled: False
+  aaf_cache_expiry_mins: 5
+  aaf_url: https://aaf-service:8100
+  aaf_user_roles:
+      - '/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
+  aaf_sms_port: 10443
+  aaf_sms_timeout: 30
+  secret_domain: osdf
+  aaf_ca_certs: /opt/app/ssl_cert/aaf_root_ca.cer
+  # config db api
+  configDbUrl: http://config.db.url:8080
+  configDbGetCellListUrl: 'SDNCConfigDBAPI/getCellList'
+  configDbGetNbrListUrl: 'SDNCConfigDBAPI/getNbrList'
+  #aai api
+  aaiUrl: https://aai:8443
+  aaiGetLinksUrl: /aai/v16/network/logical-links
+  aaiServiceInstanceUrl : /aai/v20/nodes/service-instances/service-instance/
+  aaiGetControllersUrl: /aai/v19/external-system/esr-thirdparty-sdnc-list
+  controllerQueryUrl: /aai/v19/query?format=resource
+  aaiGetInterDomainLinksUrl: /aai/v19/network/logical-links?link-type=inter-domain&operational-status=up
+  #des api
+  desUrl: https://des.url:9000
+  desApiPath: /datalake/v1/exposure/
+
 # default number of instances
 replicaCount: 1
 nodeSelector: {}
 affinity: {}
 # Resource Limit flavor -By Default using small
 flavor: small
+
+#sub-charts configuration
+certInitializer:
+  nameOverride: oof-osdf-cert-initializer
+  fqdn: "oof.onap"
+  app_ns: "org.osaaf.aaf"
+  fqi: "oof@oof.onap.org"
+  fqi_namespace: org.onap.oof
+  public_fqdn: "oof.onap.org"
+  aafDeployFqi: "deployer@people.osaaf.org"
+  aafDeployPass: demo123456!
+  cadi_latitude: "0.0"
+  cadi_longitude: "0.0"
+  credsPath: /opt/app/osaaf/local
+  appMountPath: /opt/osdf/osaaf
+  aaf_add_config: >
+    chmod 444 {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key;
+
 # Segregation for Different environment (Small and Large)
 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
@@ -112,3 +161,17 @@ service:
   nodePort: 48
 ingress:
   enabled: false
+  service:
+    - baseaddr: "oofosdf"
+      name: "oof-osdf"
+      port: 8698
+  config:
+    ssl: "redirect"
+
+#component overrides
+
+oof-cmso:
+  enabled: true
+oof-has:
+  enabled: true
+  certSecret: *oof-certs