aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-09-13 09:23:55 -0500
committerBrian Freeman <bf1936@att.com>2019-09-13 09:24:04 -0500
commit00a07150311b6f6a8cc65360aa478d1a0fc20591 (patch)
tree2fed3803d5dce47e12f0295d632c44531aa748ea
parent048e08954b756a4e18a7d665b744b477ec03f2f6 (diff)
Add sdc keyspaces and longer timeout
Issue-ID: INT-1244 Change-Id: I5bc0f4e02ac3d2d8df867f76327e588353c76da8 Signed-off-by: Brian Freeman <bf1936@att.com>
-rwxr-xr-xdeployment/heat/onap-rke/scripts/cleanup.sh6
-rw-r--r--deployment/heat/onap-rke/staging-image-override.yaml1
2 files changed, 4 insertions, 3 deletions
diff --git a/deployment/heat/onap-rke/scripts/cleanup.sh b/deployment/heat/onap-rke/scripts/cleanup.sh
index 405bc5ae4..a39e4edc1 100755
--- a/deployment/heat/onap-rke/scripts/cleanup.sh
+++ b/deployment/heat/onap-rke/scripts/cleanup.sh
@@ -30,8 +30,8 @@ if [ $COMPONENT == "dcae" ]; then
fi
if [ $COMPONENT == "sdc" ]; then
- for keyspace in sdctitan sdcrepository sdcartifact sdccomponent sdcaudit; do
- kubectl -n $NAMESPACE exec dev-cassandra-cassandra-0 -- cqlsh -u cassandra -p cassandra -e "drop keyspace ${keyspace}"
+ for keyspace in sdctitan sdcrepository sdcartifact sdccomponent sdcaudit workflow dox zusammen_dox zusammen_workflow ; do
+ kubectl -n $NAMESPACE exec dev-cassandra-cassandra-0 -- cqlsh -u cassandra -p cassandra --request-timeout=30 -e "drop keyspace ${keyspace}"
done
fi
@@ -57,4 +57,4 @@ done
ARRAY=(`kubectl get services -n $NAMESPACE | grep -e ^$COMPONENT | awk '{print $1}'`)
for i in ${ARRAY[*]}; do
kubectl delete service -n $NAMESPACE $i
-done \ No newline at end of file
+done
diff --git a/deployment/heat/onap-rke/staging-image-override.yaml b/deployment/heat/onap-rke/staging-image-override.yaml
index 0fe3cf3c1..84e554135 100644
--- a/deployment/heat/onap-rke/staging-image-override.yaml
+++ b/deployment/heat/onap-rke/staging-image-override.yaml
@@ -55,6 +55,7 @@ sdc:
cassandraInitImage: onap/sdc-cassandra-init:1.5-STAGING-latest
robot:
image: onap/testsuite:1.5.2-STAGING-latest
+
sdnc:
image: onap/sdnc-image:1.7-STAGING-latest
sdnc-ansible-server: