From 49c000849c7cd9c2beeba433ceb945a7610724f8 Mon Sep 17 00:00:00 2001
From: tlichten <tlichten@netapp.com>
Date: Wed, 2 Sep 2015 11:33:36 +0200
Subject: [PATCH] Limiting applicability to cDOT 8.2.3 due to new image format
 for 8.3

---
 README.md            | 2 +-
 Vagrantfile          | 2 +-
 provision/vagrant.sh | 3 +--
 provision/vsim.sh    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 089c98a..7cb3b91 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ The goal of this project is to experimentally provide a largely automated, turn-
  - If you use [Git](http://git-scm.com/), clone this repo. If you don't use Git, [download](https://github.com/tlichten/vagrant-vsim/archive/master.zip) the project and extract it.
  - Download [*NetApp Manageability (NM) SDK*](https://mysupport.netapp.com/NOW/download/software/nmsdk/5.4/). Version 5.4 has been tested.
  - Save the downloaded file ```netapp-manageability-sdk*.zip``` to this project's root directory, e.g. ```~/vagrant-vsim/netapp-manageability-sdk-5.4.zip```
- - Download [*Clustered Data ONTAP 8.x Simulator for VMware Workstation, VMware Player, and VMware Fusion*](http://mysupport.netapp.com/NOW/download/tools/simulator/ontap/8.X/). Version 8.3RC1 and 8.2.3 has been tested.
+ - Download [*Clustered Data ONTAP 8.x Simulator for VMware Workstation, VMware Player, and VMware Fusion*](http://mysupport.netapp.com/NOW/download/tools/simulator/ontap/8.X/). Version 8.2.3 has been tested.
  - Save the downloaded file ```vsim_netapp-cm.tgz``` to this project's root directory, e.g. ```~/vagrant-vsim/vsim_netapp-cm.tgz```
  - Configure the Cluster base license.  
  Edit ```vsim.conf```, at the top set the 8.x Cluster base license within ```CLUSTER_BASE_LICENSE``` accordingly. The license can be obtained from the [support site](http://mysupport.netapp.com/NOW/download/tools/simulator/ontap/8.X/).  
diff --git a/Vagrantfile b/Vagrantfile
index 5ec404e..2f972e9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -51,7 +51,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vsim.vm.boot_timeout = 800
     vsim.vm.synced_folder '.', '/vagrant', disabled: true
     vsim.vm.provider "virtualbox" do |v|
-      v.memory = 5120
+      v.memory = 1600
     end
     # NODE_MGMT_IP is used below to ensure the nics will be on the same VBOXNET as the servicevm.
     # The nic ips are not configured by vagrant as the auto_config param is set to false, instead a dnsmasq 
diff --git a/provision/vagrant.sh b/provision/vagrant.sh
index 5c10b8a..be7c4ef 100644
--- a/provision/vagrant.sh
+++ b/provision/vagrant.sh
@@ -2,7 +2,6 @@
 
 # update system
 export DEBIAN_FRONTEND noninteractive
-sudo rm -Rf /var/lib/apt/lists/* -vf
 sudo apt-get update
 sudo apt-get install -qqy git
 
@@ -11,7 +10,7 @@ PROVISION=$1
 # determine checkout folder
 export OS_USER=vagrant
 PWD=$(su $OS_USER -c "cd && pwd")
-VAGRANT_VSIM="$PWD/vagrant-vsim"
+VAGRANT_VSIM="/vagrant"
 # check if vagrant-vsim is already there
 if [ ! -d "$VAGRANT_VSIM" ]
 then
diff --git a/provision/vsim.sh b/provision/vsim.sh
index 3d81da5..41dc26b 100755
--- a/provision/vsim.sh
+++ b/provision/vsim.sh
@@ -29,7 +29,7 @@ sudo iptables-save > /dev/null
 echo "Awaiting Pre-Cluster mode. This can take a few minutes ..."
 rc=1; 
 while [ $rc -ne 0 ]; do 
-  /usr/bin/wget --no-proxy $NODE_MGMT_IP/na_admin > /dev/null 2>&1
+  /usr/bin/wget -O /dev/null -o /dev/null --no-proxy $NODE_MGMT_IP/na_admin  > /dev/null 2>&1
   rc=$?
   sleep 1  
   echo -n '.'