From df353be353e1ec25ac2a0e64a9eb617dcbc87703 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 21 Sep 2020 22:13:05 +0200
Subject: Use integration-java11 Dockerfile

Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC

Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>
---
 sdc-os-chef/pom.xml                                               | 1 +
 .../templates/default/change_cassandra_pass.sh.erb                | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'sdc-os-chef')

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index c5d82ceb88..01cc295023 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -59,6 +59,7 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
+                            <verbose>${verbose}</verbose>
                             <apiVersion>${docker.api.version}</apiVersion>
                             <registry>nexus3.onap.org:10001</registry>
                             <authConfig>
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
index a9d71808b8..d3f5da6b12 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/change_cassandra_pass.sh.erb
@@ -8,16 +8,16 @@ pass_changed=99
 retry_num=1
 is_up=0
 while [ $is_up -eq 0 -a $retry_num -le 100 ]; do
-   echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT > /dev/null 2>&1
+   echo "exit" | cqlsh -u cassandra -p cassandra $CASSANDRA_IP $CASSANDRA_PORT
    res1=$?
-   echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT > /dev/null 2>&1
+   echo "exit" | cqlsh -u cassandra -p $CASSANDRA_PASS $CASSANDRA_IP $CASSANDRA_PORT
    res2=$?
 
    if [ $res1 -eq 0 -o $res2 -eq 0 ]; then
-      echo "`date` --- cqlsh is enabled to connect."
+      echo "`date` --- cqlsh is able to connect."
       is_up=1
    else
-      echo "`date` --- cqlsh is NOT enabled to connect yet. sleep 5"
+      echo "`date` --- cqlsh is NOT able to connect yet. sleep 5"
       sleep 5
    fi
    let "retry_num++"
-- 
cgit 1.2.3-korg