From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 17 Sep 2020 12:19:36 +0000 (+0000)
Subject: Merge "Add A1 Policy Management Service helm charts"
X-Git-Tag: 7.0.0~234
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0b14ba4a20a879ef6b94ae5db64fa08354d2f648;hp=-c;p=oom.git

Merge "Add A1 Policy Management Service helm charts"
---

0b14ba4a20a879ef6b94ae5db64fa08354d2f648
diff --combined kubernetes/onap/resources/environments/public-cloud.yaml
index 08329d8b43,ce16f4f957..4a910987a9
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@@ -1,4 -1,5 +1,5 @@@
  # Copyright © 2017 Amdocs, Bell Canada
+ # Copyright (c) 2020 Nordix Foundation, Modifications
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -146,6 -147,9 +147,6 @@@ sdnc
    sdnc-ansible-server:
      readiness:
        initialDelaySeconds: 120
 -  sdnc-portal:
 -    readiness:
 -      initialDelaySeconds: 120
    ueb-listener:
      liveness:
        initialDelaySeconds: 60
@@@ -174,3 -178,10 +175,10 @@@ mariadb-galera
      readiness:
        initialDelaySeconds: 120
  
+ a1policymanagement:
+   liveness:
+     initialDelaySeconds: 60
+     periodSeconds: 10
+   readiness:
+     initialDelaySeconds: 60
+     periodSeconds: 10
diff --combined kubernetes/onap/values.yaml
index 9928e93445,267a731fb0..2b18288ea3
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -1,4 -1,5 +1,5 @@@
  # Copyright © 2019 Amdocs, Bell Canada
+ # Copyright (c) 2020 Nordix Foundation, Modifications
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -48,8 -49,9 +49,8 @@@ global
      password: docker
    dockerHubRepository: docker.io
  
 -  # readiness check - temporary repo until images migrated to nexus3
 -  readinessRepository: oomk8s
 -  readinessImage: readiness-check:2.2.2
 +  # readiness check
 +  readinessImage: onap/oom/readiness:3.0.1
  
    # curl image
    curlImage: curlimages/curl:7.69.1
@@@ -89,11 -91,6 +90,11 @@@
    # flag to enable debugging - application support required
    debugEnabled: false
  
 +  # default password complexity
 +  # available options: phrase, name, pin, basic, short, medium, long, maximum security
 +  # More datails: https://masterpassword.app/masterpassword-algorithm.pdf
 +  passwordStrength: long
 +
    # configuration to set log level to all components (the one that are using
    # "common.log.level" to set this)
    # can be overrided per components by setting logConfiguration.logLevelOverride
@@@ -307,3 -304,5 +308,5 @@@ vnfsdk
    enabled: false
  modeling:
    enabled: false
+ a1policymanagement:
+   enabled: false