Correct minor issues in onap deployment scripts

Generated by deploy.sh heat template has been fixed to allow
provisioning onap without proxy. Some minor fixes have been
also implemented in openstack resources checks and git operations.

Issue-ID: MULTICLOUD-708

Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ie97b1845e217068a1c5634fbf8f2864cd4a4da29

diff --git a/deployment/heat/onap-rke/nfs_vm_entrypoint.sh b/deployment/heat/onap-rke/nfs_vm_entrypoint.sh
index f8997c9..bbab5df 100644 (file)
--- a/deployment/heat/onap-rke/nfs_vm_entrypoint.sh
+++ b/deployment/heat/onap-rke/nfs_vm_entrypoint.sh
@@ -93,14 +93,18 @@ service nfs-kernel-server restart
 
 nfs_volume_dev="/dev/disk/by-id/virtio-$(echo "__nfs_volume_id__" | cut -c -20)"
 
+until [ -b "$nfs_volume_dev" ]; do
+    sleep 1m
+done
+
 zpool create -f -m /dockerdata-nfs dockerdata-nfs $nfs_volume_dev
 zfs set compression=lz4 dockerdata-nfs
 zfs set sharenfs="rw=*" dockerdata-nfs
 
 # update and initialize git
-git config --global user.email root@nfs
-git config --global user.name root@nfs
-git config --global log.decorate auto
+git config --system user.email root@nfs
+git config --system user.name root@nfs
+git config --system log.decorate auto
 
 # version control the persistence volume to see what's happening
 chmod 777 /dockerdata-nfs/
@@ -108,7 +112,7 @@ chown nobody:nogroup /dockerdata-nfs/
 cd /dockerdata-nfs/
 git init
 git add -A
-git commit -m "initial commit"
+git commit -m "initial commit" --allow-empty
 
 
 

diff --git a/deployment/heat/onap-rke/parts/onap-oom-1.yaml b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
index ea3cc06..eaa7159 100644 (file)
--- a/deployment/heat/onap-rke/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-rke/parts/onap-oom-1.yaml
@@ -4,9 +4,11 @@ description: ONAP on RKE Kubernetes using OOM
 parameters:
   docker_proxy:
     type: string
+    default: ""
 
   apt_proxy:
     type: string
+    default: ""
 
   public_net_id:
     type: string

diff --git a/deployment/heat/onap-rke/scripts/teardown-onap.sh b/deployment/heat/onap-rke/scripts/teardown-onap.sh
index e6805ff..f465250 100755 (executable)
--- a/deployment/heat/onap-rke/scripts/teardown-onap.sh
+++ b/deployment/heat/onap-rke/scripts/teardown-onap.sh
@@ -112,7 +112,7 @@ else
 
     STACK=$install_name
 
-    STATUS=$(openstack stack check $STACK)
+    STATUS=$(openstack stack check $STACK 2>&1)
 
     if [ "Stack not found: $install_name" != "$STATUS" ]; then
         openstack stack delete $STACK