Revert zfs and ceph volume

Issue-ID: SDC-2502
Change-Id: Ief0bfdc02b05dca33a99d6a041ba905fb3cfd780
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index 74df150..9da5150 100644 (file)
--- 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 bbab5df..bb0c80a 100644 (file)
--- 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 ~