Merge "Move to 2.1.17"

20 files changed, 35 insertions, 32 deletions

diff --git a/auth/auth-batch/file b/auth/auth-batch/file
deleted file mode 100644
index 4055fcda..00000000
--- a/auth/auth-batch/file
+++ /dev/null
@@ -1,4 +0,0 @@
-instructions
-instructions
-promptinstructions
-promptinstructions
diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index d5db8df3..6bebd2c6 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index fd0706f2..0683fde2 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -3,7 +3,8 @@
 # Engage normal Cass Init, then check for data installation
 #
 DIR="/opt/app/aaf/status"
-INSTALLED_VERSION=/etc/cassandra/AAF_VERSION
+INSTALLED_VERSION=/var/lib/cassandra/AAF_VERSION
+AAF_INIT_DATA=/var/lib/cassandra/AAF_INIT_DATA
 
 if [ ! -e /aaf_cmd ]; then
   ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd
@@ -92,13 +93,18 @@ function install_cql {
 function install_onap {
     echo " cd /opt/app/aaf/cass_init"
     install_cql initialized
-    status prep data for bootstrapping
-    cd /opt/app/aaf/cass_init
-    status prep data 
-    bash prep.sh
-    status push data to cassandra
-    bash push.sh
-    cd -
+    if [ -e "$AAF_INIT_DATA" ]; then 
+       echo "AAF Data already initialized on this Cassandra"
+    else 
+      status prep data for bootstrapping
+      cd /opt/app/aaf/cass_init
+      status prep data 
+      bash prep.sh
+      status push data to cassandra
+      bash push.sh
+      cd -
+      echo $(date) > $AAF_INIT_DATA
+    fi
     status ready
 }
 
diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index f47b601e..c7c0e489 100644
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index dc63f666..f398e58c 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index b50c636b..369b53bd 100644
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 10232ef6..9e8f30d8 100644
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 182e3ea6..ed1fe928 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -26,7 +26,7 @@
 		<artifactId>authparent</artifactId>
 		<relativePath>../pom.xml</relativePath>
 		<groupId>org.onap.aaf.authz</groupId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>aaf-auth-deforg</artifactId>
diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index bca16eec..671d4a24 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index f6e9d6dd..d5b1c6ff 100644
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 67403bc6..527a9ef5 100644
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 2b3994e1..8291ff42 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index 81784b89..61a8881c 100644
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index ad74853e..5b747043 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>authparent</artifactId>
-		<version>2.1.6-SNAPSHOT</version>
+		<version>2.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index 45f5b43a..f6ae5cd3 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -9,7 +9,7 @@ fi
 . ./aaf.props
 
 DOCKER=${DOCKER:=docker}
-CADI_VERSION=${CADI_VERSION:=2.1.6-SNAPSHOT}
+CADI_VERSION=${CADI_VERSION:=2.1.7-SNAPSHOT}
 
 for V in VERSION DOCKER_REPOSITORY AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
    if [ "$(grep $V ./aaf.props)" = "" ]; then
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index b64ba1f0..eab44cbc 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -2,7 +2,7 @@
 ORG=onap
 PROJECT=aaf
 DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.6-SNAPSHOT
+VERSION=2.1.7-SNAPSHOT
 CONF_ROOT_DIR=/opt/app/osaaf
 # For local builds, set PREFIX=   
 PREFIX="$DOCKER_REPOSITORY/"
diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml
index 323a6e14..7f43534c 100644
--- a/auth/helm/aaf/Chart.yaml
+++ b/auth/helm/aaf/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: AAF Helm Chart
 name: aaf
-version: 2.1.4-SNAPSHOT
+version: 2.1.7-SNAPSHOT
diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml
index 7002bc09..e8d91e2c 100644
--- a/auth/helm/aaf/templates/aaf-cass.yaml
+++ b/auth/helm/aaf/templates/aaf-cass.yaml
@@ -38,7 +38,7 @@ spec:
       volumes:
       - name: {{ .Chart.Name }}-cass-vol
         persistentVolumeClaim:
-        claimName: {{ .Chart.Name }}-cass-pvc
+          claimName: {{ .Chart.Name }}-cass-pvc
       containers:
 ###
 ### AAF-CASS
@@ -49,7 +49,7 @@ spec:
         # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well
         command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"]
         volumeMounts:
-          - mountPath: "/data"
+          - mountPath: "/var/lib/cassandra"
             name: {{ .Chart.Name }}-cass-vol
         ports:
         - name: storage
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 839d939a..83e0ae68 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -22,7 +22,8 @@ cadi:
   aaf_locate_as: "aaf-locate"
 
 persistence:
-  mountPath: "/mnt/data/aaf"
+  # Note: Minikube will persist to /data on your host machine
+  mountPath: "/data/aaf"
   config:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
@@ -48,7 +49,7 @@ image:
   # When using Docker Repo, add, and include trailing "/"
   # repository: nexus3.onap.org:10003/
   # repository: localhost:5000/
-  version: 2.1.6-SNAPSHOT
+  version: 2.1.7-SNAPSHOT
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/auth/pom.xml b/auth/pom.xml
index d6426cef..61ad1c4e 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.6-SNAPSHOT</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
 	<artifactId>authparent</artifactId>
 	<name>AAF Auth Parent</name>