<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>aaf-auth-client</artifactId>
+++ /dev/null
-instructions
-instructions
-promptinstructions
-promptinstructions
<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>
# 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
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
}
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
. ./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
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/"
appVersion: "1.0"
description: AAF Helm Chart
name: aaf
-version: 2.1.4-SNAPSHOT
+version: 2.1.7-SNAPSHOT
volumes:
- name: {{ .Chart.Name }}-cass-vol
persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-cass-pvc
+ claimName: {{ .Chart.Name }}-cass-pvc
containers:
###
### AAF-CASS
# 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
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
# 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
<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>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>CADI Servlet Sample (Test Only)</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
</parent>
<artifactId>miscparent</artifactId>
<name>AAF Misc Parent</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.1.6-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<name>aaf-authz</name>
<packaging>pom</packaging>
major=2
minor=1
-patch=6
+patch=7
base_version=${major}.${minor}.${patch}