From 1160da46b6fd3a98608e59ca82c14529af94edbd Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Wed, 14 Aug 2019 17:28:09 -0500 Subject: Revert zfs and ceph volume Issue-ID: SDC-2502 Change-Id: Ief0bfdc02b05dca33a99d6a041ba905fb3cfd780 Signed-off-by: Brian Freeman --- deployment/heat/onap-rke/env/windriver/onap-oom.env | 2 +- deployment/heat/onap-rke/nfs_vm_entrypoint.sh | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env index 74df15047..9da515031 100644 --- a/deployment/heat/onap-rke/env/windriver/onap-oom.env +++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env @@ -5,7 +5,7 @@ parameters: apt_proxy: 10.12.5.2:8000 docker_proxy: 10.12.5.2:5000 - nfs_vm_flavor: m1.lm.large + nfs_vm_flavor: m1.lm.xlarge k8s_vm_flavor: m1.lm.xlarge orch_vm_flavor: m1.lm.medium diff --git a/deployment/heat/onap-rke/nfs_vm_entrypoint.sh b/deployment/heat/onap-rke/nfs_vm_entrypoint.sh index bbab5df15..bb0c80a50 100644 --- a/deployment/heat/onap-rke/nfs_vm_entrypoint.sh +++ b/deployment/heat/onap-rke/nfs_vm_entrypoint.sh @@ -97,9 +97,14 @@ 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 +zpool create -f -m /dockerdata-nfs-z dockerdata-nfs-z $nfs_volume_dev +zfs set compression=lz4 dockerdata-nfs-z +zfs set sharenfs="rw=*" dockerdata-nfs-z + + +mkdir -p /dockerdata-nfs + + # update and initialize git git config --system user.email root@nfs @@ -115,6 +120,10 @@ git add -A git commit -m "initial commit" --allow-empty +# export NFS mount +echo "/dockerdata-nfs *(rw,fsid=1,async,no_root_squash,no_subtree_check)" | tee /etc/exports +exportfs -a +systemctl restart nfs-kernel-server cd ~ -- cgit 1.2.3-korg