Merge "Sonar Fix: ApprovalDAO.java"

[aaf/authz.git] / auth / helm / aaf / aaf.sh

diff --git a/auth/helm/aaf/aaf.sh b/auth/helm/aaf/aaf.sh
index 5bb8351..2b94c2f 100644 (file)
--- a/auth/helm/aaf/aaf.sh
+++ b/auth/helm/aaf/aaf.sh
@@ -1,12 +1,12 @@
-. ../../docker/d.props
-IMAGE=onap/aaf/aaf_agent:$VERSION
+. ../../docker/aaf.props
+IMAGE=onap/aaf/aaf_config:$VERSION
 
-kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
+kubectl -n onap run -it --rm aaf-config-$USER --image=$IMAGE --overrides='
 {
     "spec": {
         "containers": [
             {
-                "name": "aaf-agent-'$USER'",
+                "name": "aaf-config-'$USER'",
                "image": "'$IMAGE'",
                 "imagePullPolicy": "IfNotPresent",
                "command": [
@@ -16,25 +16,31 @@ kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
                  ],
                 "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_fqdn",
-                     "value": "'$HOSTNAME'"
-                  },{
-                     "name": "aaf_locator_url",
-                     "value": "https://aaf-locate:8095"
+                     "name": "aaf_locator_container_ns",
+                     "value": "onap"
                   },{
-                     "name": "aaf_locator_public_hostname",
-                     "value": "'$HOSTNAME'"
+                     "name": "aaf_locator_public_fqdn",
+                     "value": "aaf.osaaf.org"
                   },{
-                     "name": "AAF_ENV",
-                     "value": "'$AAF_ENV'"
+                     "name": "aaf_locator_fqdn",
+                     "value": "aaf.osaaf.org"
                   },{
-                     "name": "LATITUDE",
+                     "name": "cadi_latitude",
                      "value": "'$LATITUDE'"
                   },{
-                     "name": "LONGITUDE",
+                     "name": "cadi_longitude",
                      "value": "'$LONGITUDE'"
                   },{
                      "name": "CASSANDRA_CLUSTER",