update Agent for Helm

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

1 files changed, 28 insertions, 41 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"
                 }
             }
         ]