Apply Cert changes

Issue-ID: AAF-822
Change-Id: I3185d827f3f67cb177534f7c7f3281375b77c613
Signed-off-by: Instrumental <jonathan.gathman@att.com>

1 files changed, 81 insertions, 19 deletions

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 5a095e4cd9..e07f3461c6 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -18,25 +18,83 @@
 global:
   nodePortPrefix: 302
   readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: readiness-check:2.0.2
   ubuntuInitRepository: registry.hub.docker.com
   ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  configImage: onap/aaf/aaf_config:2.1.9-SNAPSHOT-latest
   persistence:
     enabled: true
+  pullPolicy: Always
+  repository: "nexus3.onap.org:10001"
+  # pullPolicy: IfNotPresent
+  # repository: "nexus3.onap.org:10003"
 
-  cadi:
-    hostname: "aaf.onap"
+  aaf:
+    imageVersion: 2.1.12-SNAPSHOT
+    #imageVersion: latest
+    readiness: false
+    aaf_env: "DEV"
+    public_fqdn: "aaf.osaaf.org"
+    aaf_release: "Dublin"
+  # DUBLIN ONLY - for M4 compatibility with Casablanca
+    aaf_locator_name: "public.%NS.%N"
+    aaf_locator_name_oom: "%NS.%N"
+  # EL ALTO and Beyond
+  #  aaf_locator_name: "%NS.%N"
+  #  aaf_locator_name_oom: "%CNS.%NS.%N"
     cadi_latitude: "38.0"
     cadi_longitude: "-72.0"
-    aaf_env: "DEV"
-    cass_host: "aaf-cass.onap"
-    cadi_locator_as: "aaf-locate.onap"
+    cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+
+    cass:
+      replicas: 1
+      fqdn: "aaf-cass"
+      cluster_name: "osaaf"
+      heap_new_size: "512M"
+      max_heap_size: "1024M"
+      storage_port: 7000
+      ssl_storage_port: 7001
+      native_trans_port: 9042
+      rpc_port: 9160
+      dc: "dc1"
+    service:
+      replicas: 1
+      fqdn: "aaf-service"
+      internal_port: 8100
+      public_port: 31110
+    locate:
+      replicas: 1
+      fqdn: "aaf-locate"
+      internal_port: 8095
+      public_port: 31111
+    oauth:
+      replicas: 1
+      fqdn: "aaf0oauth"
+      internal_port: 8140
+      public_port: 31112
+    gui:
+      replicas: 1
+      fqdn: "aaf-gui"
+      internal_port: 8200
+      public_port: 31113
+    cm:
+      replicas: 1
+      fqdn: "aaf-cm"
+      internal_port: 8150
+      public_port: 31114
+    fs:
+      replicas: 1
+      fqdn: "aaf-fs"
+      internal_port: 8096
+      public_port: 31115
+    hello:
+      replicas: 0
+      fqdn: "aaf-hello"
+      internal_port: 8130
+      public_port: 31116
 
 #################################################################
 # Application configuration defaults.
 #################################################################
-repository: nexus3.onap.org:10001
 
 flavor: small
 # default number of instances
@@ -48,14 +106,14 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 350
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 150
   periodSeconds: 10
 
 ingress:
@@ -63,31 +121,35 @@ ingress:
 
 ## Persist data to a persitent volume
 persistence:
-  mountPath: "/mnt/data/aaf"
   enabled: true
   config:
     #existingClaim:
-    volumeReclaimPolicy: Retain
+    volumeReclaimPolicy: Delete
     accessMode: ReadWriteMany
     size: 2Gi
-    mountSubPath: "config"
     storageClass: "manual"
+    mountPath: "/mnt/data/aaf/config"
   logs:
     #existingClaim:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteMany
     size: 2Gi
-    mountSubPath: "logs"
     storageClass: "manual"
-
-aaf-cs:
-  persistence:
-    #existingClaim:
+    mountPath: "/mnt/data/aaf/logs"
+  status:
+    volumeReclaimPolicy: Delete
+    accessMode: ReadWriteMany
+    size: 2M
+    storageClass: "manual"
     mountPath: /dockerdata-nfs
-    mountSubPath: "cass"
+    mountSubPath: "status"
+  cass:
+    #existingClaim:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
     size: 10Gi
     storageClass: "manual"
+    mountPath: /dockerdata-nfs
+    mountSubPath: "cass"
 
 resources: {}