diff options
| author |   varun gudisena <varuneshwar.gudisena@att.com> | 2018-10-31 08:01:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-31 08:01:19 +0000 |
| commit | 944be36dc15900cc9b3a8cf04916f5ef446824c6 (patch) | |
| tree | 543f2415c6ca57c7f67b8bc7c024ece8ca8ff6b0 | |
| parent | 556e22af6ff1c11d6e76eda97a8b26f5f14cec83 (diff) | |
| parent | 50c23cc7adb0c5aef4415b7bd38fecec29f4fb2a (diff) | |
Merge "Move to 2.1.17"
34 files changed, 49 insertions, 46 deletions
diff --git a/auth-client/pom.xml b/auth-client/pom.xml index 79f64587..32d8e7b4 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -25,7 +25,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>aaf-auth-client</artifactId> 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> diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 2a613486..10731cf0 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 87956d14..63920a2a 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ <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> diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index 87b0a1a1..34886d26 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ <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> diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 7b1d20a1..edbd2b0e 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ <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> diff --git a/cadi/pom.xml b/cadi/pom.xml index 811ad9f7..3e3a8c55 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,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>cadiparent</artifactId> <name>AAF CADI Parent (Code, Access, Data, Identity)</name> diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 385e00a7..49537146 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ <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> diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 87ba9a2a..9b63e347 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 694b5b20..c72f5b8d 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/misc/pom.xml b/misc/pom.xml index 49ed2f5e..b4ef0ceb 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,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>miscparent</artifactId> <name>AAF Misc Parent</name> diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 81e40dfe..383c8967 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 7a99d85b..7fc3fe32 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ <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> @@ -22,7 +22,7 @@ <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> diff --git a/version.properties b/version.properties index 0349e30b..2400e4d3 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=2 minor=1 -patch=6 +patch=7 base_version=${major}.${minor}.${patch} |