From a3990d05cd7a7f92a383cdeb9e4e89f0bc0d8a7b Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Tue, 30 Jul 2019 09:02:42 +0200 Subject: Correct minor issues in onap deployment scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: Ie97b1845e217068a1c5634fbf8f2864cd4a4da29 --- deployment/heat/onap-rke/nfs_vm_entrypoint.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'deployment/heat/onap-rke/nfs_vm_entrypoint.sh') diff --git a/deployment/heat/onap-rke/nfs_vm_entrypoint.sh b/deployment/heat/onap-rke/nfs_vm_entrypoint.sh index f8997c96f..bbab5df15 100644 --- 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 -- cgit 1.2.3-korg