update Agent for Helm

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

20 files changed, 289 insertions, 296 deletions

diff --git a/auth/helm/aaf-hello/aaf.sh b/auth/helm/aaf-hello/aaf.sh
index b1c8e639..2a99d1bb 100644
--- a/auth/helm/aaf-hello/aaf.sh
+++ b/auth/helm/aaf-hello/aaf.sh
@@ -16,39 +16,36 @@ kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
                  ],
                 "env": [
                    {
+                     "name": "APP_FQI",
+                     "value": "aaf@aaf.osaaf.org"
+                   },{
+                     "name": "DEPLOY_FQI",
+                     "value": "deployer@people.osaaf.org"
+                   },{
+                     "name": "DEPLOY_PASSWORD",
+                     "value": "demo123456!"
+                   },{
+                     "name": "aaf_locate_url",
+                     "value": "https://aaf-locate.onap:8095"
+                   },{
                      "name": "aaf_locator_container",
                      "value": "helm"
-		   },{
+                   },{
+                     "name": "aaf_locator_container_ns",
+                     "value": "onap"
+                   },{
+                     "name": "aaf_locator_public_fqdn",
+                     "value": "aaf.osaaf.org"
+                   },{
                      "name": "aaf_locator_fqdn",
-                     "value": "'$HOSTNAME'"
-		   },{
-                     "name": "aaf_locator_url",
-                     "value": "https://aaf-locate:8095"
-		   },{
-                     "name": "aaf_locator_public_hostname",
-                     "value": "'$HOSTNAME'"
-		   },{
-                     "name": "AAF_ENV",
-                     "value": "'$AAF_ENV'"
-		   },{
-                     "name": "LATITUDE",
+                     "value": "aaf-hello"
+                   },{
+                     "name": "cadi_latitude",
                      "value": "'$LATITUDE'"
-		   },{
-                     "name": "LONGITUDE",
+                   },{
+                     "name": "cadi_longitude",
                      "value": "'$LONGITUDE'"
-		   },{
-                     "name": "CASSANDRA_CLUSTER",
-                     "value": "'$CASSANDRA_CLUSTER'"
-		   },{
-                     "name": "CASSANDRA_USER",
-                     "value": "'$CASSANDRA_USER'"
-		   },{
-                     "name": "CASSANDRA_PASSWORD",
-                     "value": "'$CASSANDRA_PASSWORD'"
-		   },{
-                     "name": "CASSANDRA_PORT",
-                     "value": "'$CASSANDRA_PORT'"
-		   }
+                   }
                 ],
                 "stdin": true,
                 "stdinOnce": true,
@@ -56,26 +53,16 @@ kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
                 "volumeMounts": [
                     {
                         "mountPath": "/opt/app/osaaf",
-                        "name": "aaf-config-vol"
-                    },
-                    {
-                        "mountPath": "/opt/app/aaf/status",
-                        "name": "aaf-status-vol"
+                        "name": "aaf-hello-vol"
                     }
                 ]
             }
         ],
       "volumes": [
             {
-                "name": "aaf-config-vol",
-                "persistentVolumeClaim": {
-                    "claimName": "aaf-config-pvc"
-                }
-            },
-            {
-                "name": "aaf-status-vol",
+                "name": "aaf-hello-vol",
                 "persistentVolumeClaim": {
-                    "claimName": "aaf-status-pvc"
+                    "claimName": "aaf-hello-pvc"
                 }
             }
         ]
diff --git a/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml b/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml
new file mode 100644
index 00000000..166d766a
--- /dev/null
+++ b/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml
@@ -0,0 +1,44 @@
+{{- if and .Values.global.persistence.enabled (not .Values.persistence.existingClaim) -}}
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
+
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: {{ .Chart.Name  }}-pv
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name  }}
+spec:
+  capacity:
+    storage: {{ .Values.persistence.size}}
+  accessModes:
+    - {{ .Values.persistence.accessMode }}
+  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
+  hostPath:
+     path: {{ .Values.persistence.mountPath }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml b/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml
new file mode 100644
index 00000000..fce3aa84
--- /dev/null
+++ b/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml
@@ -0,0 +1,49 @@
+{{- if and .Values.global.persistence.enabled (not .Values.persistence.existingClaim) -}}
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Chart.Name }}-pvc
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name }}
+{{- if .Values.persistence.annotations }}
+  annotations:
+{{ toYaml .Values.persistence.annotations | indent 4 }}
+{{- end }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Chart.Name }}
+  accessModes:
+    - {{ .Values.persistence.accessMode }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/auth/helm/aaf-hello/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
index 896ff35d..7bf35cde 100644
--- a/auth/helm/aaf-hello/templates/aaf-hello.yaml
+++ b/auth/helm/aaf-hello/templates/aaf-hello.yaml
@@ -31,8 +31,8 @@ spec:
   ports:
     - name: aaf-hello
       protocol: TCP
-      port: {{.Values.cadi.port}}
-      nodePort: {{ .Values.cadi.public_port}}
+      port: {{ .Values.service.port }}
+      nodePort: {{ .Values.service.public_port }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -52,61 +52,51 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: aaf-hello-vol
-        emptyDir: {}
+        - name: aaf-hello-vol
+          persistentVolumeClaim:
+            claimName: aaf-hello-pvc
       initContainers:
         - name: aaf-hello-config
-          image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
+          image: "{{ .Values.image.repository }}{{ .Values.service.initImage }}"
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - mountPath: "/opt/app/osaaf/local"
+            - mountPath: "/opt/app/osaaf"
               name: aaf-hello-vol
-          command: ["bash","-c","cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh place aaf@aaf.osaaf.org aaf-hello "]
+          command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"]
           env:
-            - name: aaf_env
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: cadi_latitude
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: cadi_longitude
-              value: "{{ .Values.cadi.cadi_longitude }}"
+            - name: APP_FQI
+              value: "{{ .Values.service.fqi }}"
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:8095"
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
               value: "{{ .Release.Namespace }}"
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{ .Release.Namespace }}:8095"
-            - name: aaf_locator_app_ns
-              value: "org.osaaf.aaf"
-            - name: "APP_FQDN"
-              value: "{{ .Values.cadi.fqdn }}"
-            - name: "APP_FQI"
-              value: "{{ .Values.cadi.fqi }}"
+            - name: aaf_locator_fqdn
+              value: "{{.Values.service.fqdn}}"
+            - name: aaf_locator_public_fqdn
+              value: "{{.Values.service.public_fqdn}}"
+            - name: cadi_latitude
+              value: "{{ .Values.service.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.service.cadi_longitude }}"
             - name: "DEPLOY_FQI"
               value: "deployer@people.osaaf.org"
             - name: "DEPLOY_PASSWORD"
               value: "demo123456!"
-# Hello specific.  Clients don't necessarily need this
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.cadi.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.cadi.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.cadi.aaf_locator_name_helm}}"
-            - name: aaf_locator_fqdn_helm
-              value: "%N.%CNS"
 
 ###
 ### AAF-HELLO
 ###
       containers:
       - name: aaf-hello
-        image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
+        image: {{ .Values.image.repository }}{{ .Values.service.image }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","-c","cd /opt/app/aaf && sleep 240 && exec bin/hello"]
+        command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"]
         volumeMounts:
-        -  mountPath: "/opt/app/osaaf/local"
+        -  mountPath: "/opt/app/osaaf"
            name: aaf-hello-vol
         ports:
-        - name: aaf-hello
-          protocol: TCP
-          containerPort: 8130
+        -  name: aaf-hello
+           protocol: TCP
+           containerPort: {{ .Values.service.port }}
diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml
index cc8765f5..da37ff63 100644
--- a/auth/helm/aaf-hello/values.yaml
+++ b/auth/helm/aaf-hello/values.yaml
@@ -23,38 +23,38 @@
 # Declare variables to be passed into your templates.
 
 global:
-  common:
-    namespace: "onap"
+  persistence:
+    enabled: "true"
 
 replicas:
   hello: 1
 
-cadi:
-  fqdn: "aaf-hello"
-  port: 8130
-  public_fqdn: "aaf.osaaf.org"
-# DUBLIN ONLY - for M4 compatibility with Casablanca
-  aaf_locator_name: "public.%NS.%N"
-  aaf_locator_name_helm: "%NS.%N"
-# EL ALTO and Beyond
-#  aaf_locator_name: "%NS.%N"
-#  aaf_locator_name_helm: "%CNS.%NS.%N"
-  public_port: 30086
-  fqi: "aaf@aaf.osaaf.org"
-  app_ns: "org.osaaf.aaf"
-  cadi_latitude: 38.0
-  cadi_longitude: -72.0
-  aaf_env: "DEV"
-
-persistence: {}
-
 image:
   # When using locally built Docker Container, set Repository to ""
   repository: ""
   # When using Docker Repo, add, and include trailing "/"
   # repository: nexus3.onap.org:10003/
   # repository: localhost:5000/
-  version: 2.1.15-SNAPSHOT
+
+service:
+  initImage: onap/aaf/aaf_agent:2.1.15-SNAPSHOT
+  image: onap/aaf/aaf_hello:2.1.15-SNAPSHOT
+  app_ns: "org.osaaf.aaf"
+  fqi: "aaf@aaf.osaaf.org"
+  fqdn: "aaf-hello"
+  public_fqdn: "aaf.osaaf.org"
+  port: "8130"
+  public_port: "30086"
+  cadi_latitude: "38.0"
+  cadi_longitude: "-72.0"
+
+persistence: 
+  # Where on local disk to store
+  mountPath: "/data/aaf/hello"
+  volumeReclaimPolicy: Retain
+  accessMode: ReadWriteOnce
+  size: 10M
+  storageClass: "manual"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/auth/helm/aaf/aaf.sh b/auth/helm/aaf/aaf.sh
new file mode 100644
index 00000000..2b94c2ff
--- /dev/null
+++ b/auth/helm/aaf/aaf.sh
@@ -0,0 +1,90 @@
+. ../../docker/aaf.props
+IMAGE=onap/aaf/aaf_config:$VERSION
+
+kubectl -n onap run -it --rm aaf-config-$USER --image=$IMAGE --overrides='
+{
+    "spec": {
+        "containers": [
+            {
+                "name": "aaf-config-'$USER'",
+		"image": "'$IMAGE'",
+                "imagePullPolicy": "IfNotPresent",
+		"command": [
+                   "bash", 
+		   "-c",
+                   "/opt/app/aaf_config/bin/agent.sh && cd /opt/app/osaaf/local && exec bash"
+                 ],
+                "env": [
+                   {
+                     "name": "aaf_env",
+                     "value": "DEV"
+		   },{
+                     "name": "aaf_id",
+                     "value": "aaf@aaf.osaaf.org"
+		   },{
+                     "name": "aaf_locate_url",
+                     "value": "https://aaf-locate.onap:8095"
+		   },{
+                     "name": "aaf_locator_container",
+                     "value": "helm"
+		   },{
+                     "name": "aaf_locator_container_ns",
+                     "value": "onap"
+		   },{
+                     "name": "aaf_locator_public_fqdn",
+                     "value": "aaf.osaaf.org"
+		   },{
+                     "name": "aaf_locator_fqdn",
+                     "value": "aaf.osaaf.org"
+		   },{
+                     "name": "cadi_latitude",
+                     "value": "'$LATITUDE'"
+		   },{
+                     "name": "cadi_longitude",
+                     "value": "'$LONGITUDE'"
+		   },{
+                     "name": "CASSANDRA_CLUSTER",
+                     "value": "'$CASSANDRA_CLUSTER'"
+		   },{
+                     "name": "CASSANDRA_USER",
+                     "value": "'$CASSANDRA_USER'"
+		   },{
+                     "name": "CASSANDRA_PASSWORD",
+                     "value": "'$CASSANDRA_PASSWORD'"
+		   },{
+                     "name": "CASSANDRA_PORT",
+                     "value": "'$CASSANDRA_PORT'"
+		   }
+                ],
+                "stdin": true,
+                "stdinOnce": true,
+                "tty": true,
+                "volumeMounts": [
+                    {
+                        "mountPath": "/opt/app/osaaf",
+                        "name": "aaf-config-vol"
+                    },
+                    {
+                        "mountPath": "/opt/app/aaf/status",
+                        "name": "aaf-status-vol"
+                    }
+                ]
+            }
+        ],
+      "volumes": [
+            {
+                "name": "aaf-config-vol",
+                "persistentVolumeClaim": {
+                    "claimName": "aaf-config-pvc"
+                }
+            },
+            {
+                "name": "aaf-status-vol",
+                "persistentVolumeClaim": {
+                    "claimName": "aaf-status-pvc"
+                }
+            }
+        ]
+   }
+}
+' --restart=Never  -- bash 
diff --git a/auth/helm/aaf/templates/aaf-cass-pv.yaml b/auth/helm/aaf/templates/aaf-cass-pv.yaml
index 97b567f7..132de3fb 100644
--- a/auth/helm/aaf/templates/aaf-cass-pv.yaml
+++ b/auth/helm/aaf/templates/aaf-cass-pv.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolume
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name  }}-cass-pv
-  namespace: {{ .Values.services.namespace  }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name  }}-cass
 spec:
diff --git a/auth/helm/aaf/templates/aaf-cass-pvc.yaml b/auth/helm/aaf/templates/aaf-cass-pvc.yaml
index 80091a35..5baffead 100644
--- a/auth/helm/aaf/templates/aaf-cass-pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-cass-pvc.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name }}-cass-pvc
-  namespace: {{ .Values.services.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}-cass
 {{- if .Values.persistence.annotations }}
diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml
index cab7134b..f795dfe5 100644
--- a/auth/helm/aaf/templates/aaf-cass.yaml
+++ b/auth/helm/aaf/templates/aaf-cass.yaml
@@ -109,9 +109,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
         - name: MY_POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}
         - name: MY_POD_IP
           valueFrom:
             fieldRef:
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index f254bfde..ebb49835 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -62,41 +62,10 @@ spec:
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm "]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-CERTMAN
@@ -116,6 +85,4 @@ spec:
           containerPort: 8150
         env:
         - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}
diff --git a/auth/helm/aaf/templates/aaf-config-pv.yaml b/auth/helm/aaf/templates/aaf-config-pv.yaml
index 378ab808..ae86d73a 100644
--- a/auth/helm/aaf/templates/aaf-config-pv.yaml
+++ b/auth/helm/aaf/templates/aaf-config-pv.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolume
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name  }}-config-pv
-  namespace: {{ .Values.services.namespace  }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name  }}-config
 spec:
diff --git a/auth/helm/aaf/templates/aaf-config-pvc.yaml b/auth/helm/aaf/templates/aaf-config-pvc.yaml
index 6a6aee36..6e81c999 100644
--- a/auth/helm/aaf/templates/aaf-config-pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-config-pvc.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name }}-config-pvc
-  namespace: {{ .Values.services.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}-config
 {{- if .Values.persistence.annotations }}
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index 5bca6964..479447de 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -62,35 +62,10 @@ spec:
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-locate rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_fqdn
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-FS
@@ -112,9 +87,7 @@ spec:
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: {{ .Release.Namespace }}
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
             - name: aaf_locator_public_fqdn
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index c737c7a5..14c42599 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -63,43 +63,10 @@ spec:
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
-            - name: aaf_deployed_version
-              value: "{{ .Values.image.version }}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-GUI
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index 44531d97..d4f2bf66 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -62,41 +62,10 @@ spec:
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Release.Namespace}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-LOCATE
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index 9721b396..4d5ac75a 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -62,41 +62,10 @@ spec:
         - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
+          command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: aaf-config-vol
             - mountPath: "/opt/app/aaf/status"
               name: aaf-status-vol
-          env:
-            - name: AAF_ENV
-              value: "{{ .Values.services.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.services.cadi_longitude }}"
-            - name: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
-            - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
       containers:
 ###
 ### AAF-OAUTH
@@ -116,6 +85,4 @@ spec:
           containerPort: {{.Values.services.oauth.internal_port}}
         env:
         - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
+          value: {{ .Release.Namespace }}
diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index fc0ce66c..96efa75c 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -70,34 +70,36 @@ spec:
           env:
             - name: aaf_env
               value: "{{ .Values.services.aaf_env }}"
-            - name: cadi_latitude
-              value: "{{ .Values.services.cadi_latitude }}"
-            - name: cadi_longitude
-              value: "{{ .Values.services.cadi_longitude }}"
+            - name: aaf_id
+              value: "{{ .Values.services.aaf_id }}"
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
               value: "{{ .Release.Namespace }}"
-            - name: aaf_locate_url
-              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: aaf_locator_fqdn
+              value: "{{.Values.services.fqdn}}"
             - name: aaf_locator_public_fqdn
               value: "{{.Values.services.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.services.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.services.aaf_locator_name_helm}}"
+            - name: cadi_latitude
+              value: "{{ .Values.services.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.services.cadi_longitude }}"
+            - name: cm_always_ignore_ips
+              value: "true"
             - name: CASSANDRA_CLUSTER
-              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
+              value: "{{.Values.services.cass.fqdn}}.{{.Release.Namespace }}"
 #            - name: CASSANDRA_USER
 #              value: ""
 #            - name: CASSANDRA_PASSWORD
 #              value: ""
 #           - name: CASSANDRA_PORT
 #              value: ""
-      containers:
 ###
 ### AAF-SERVICE
 ###
+      containers:
       - name: aaf-service
         image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
diff --git a/auth/helm/aaf/templates/aaf-status-pv.yaml b/auth/helm/aaf/templates/aaf-status-pv.yaml
index 15e102c0..1a7d3c21 100644
--- a/auth/helm/aaf/templates/aaf-status-pv.yaml
+++ b/auth/helm/aaf/templates/aaf-status-pv.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolume
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name  }}-status-pv
-  namespace: {{ .Values.services.namespace  }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name  }}-status
 spec:
diff --git a/auth/helm/aaf/templates/aaf-status-pvc.yaml b/auth/helm/aaf/templates/aaf-status-pvc.yaml
index 44a5aa9c..be911942 100644
--- a/auth/helm/aaf/templates/aaf-status-pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-status-pvc.yaml
@@ -23,7 +23,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ .Chart.Name }}-status-pvc
-  namespace: {{ .Values.services.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Chart.Name }}-status
 {{- if .Values.persistence.annotations }}
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 324cbc64..4bb2037f 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -27,13 +27,9 @@ global:
     enabled: true
 
 services:
-  ns: "onap"
   aaf_env: "DEV"
+  aaf_id: "aaf@aaf.osaaf.org"
   public_fqdn: "aaf.osaaf.org"
-# DUBLIN ONLY - for M4 compatibility with Casablanca
-#  aaf_locator_name: "public.%NS.%N"
-#  aaf_locator_name_helm: "%NS.%N"
-# EL ALTO and Beyond
   aaf_locator_name: "%NS.%N"
   aaf_locator_name_helm: "%CNS.%NS.%N"
   cadi_latitude: "38.0"  
@@ -101,12 +97,6 @@ persistence:
     size: 2Gi
     mountSubPath: "config"
     storageClass: "manual"
-  hello:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    mountSubPath: "config"
-    storageClass: "manual"
 
 image:
   # When using locally built Docker Container, set Repository to ""