Fix failures preventing VM netboots

 - Remove Etcd config from dir-sot.yaml which clases with LocalDir (CiscoCloud#41)
 - Change NIC ordering so the right MAC is sent with the pxe request (CiscoCloud#42)

config/dir-sot.yaml

@@ -11,13 +11,16 @@ ServerClient:
 SavePath: "/var/vaquero"
 LocalDir:
   PollInterval: 1
-Etcd:
-  Endpoints:
-  - "http://10.10.10.5:2379"
-  - "http://10.10.10.6:2379"
-  - "http://10.10.10.7:2379"
-  Timeout: 5
-  Retry: 3
+
+# Define one of LocalDir or Etcd endpoints.
+#Etcd:
+#  Endpoints:
+#  - "http://10.10.10.5:2379"
+#  - "http://10.10.10.6:2379"
+#  - "http://10.10.10.7:2379"
+#  Timeout: 5
+#  Retry: 3
+
 SoT:
 - Local:
     ID: vaquero-local

create_cluster/cluster.sh

@@ -76,12 +76,12 @@ if [ $PXE_COUNT > 0 ]
             VBoxManage storageattach $vmName --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium $vmName.vdi;
             VBoxManage modifyvm $vmName --boot1 net --memory 2048;
 
-            VBoxManage modifyvm $vmName --nic1 natnetwork --nat-network1 vaq;
-            VBoxManage modifyvm $vmName --nictype1 82543GC --nicbootprio1 4 --cableconnected1 on;
+            VBoxManage modifyvm $vmName --nic2 natnetwork --nat-network2 vaq;
+            VBoxManage modifyvm $vmName --nictype2 82543GC --nicbootprio2 4 --cableconnected2 on;
 
 
-            VBoxManage modifyvm $vmName --nic2 intnet --intnet2 vaquero --nicpromisc2 allow-all;
-            VBoxManage modifyvm $vmName --nictype2 82543GC  --macaddress2 $mac --nicbootprio2 1 --cableconnected2 on;
+            VBoxManage modifyvm $vmName --nic1 intnet --intnet1 vaquero --nicpromisc1 allow-all;
+            VBoxManage modifyvm $vmName --nictype1 82543GC  --macaddress1 $mac --nicbootprio1 1 --cableconnected1 on;
 
             VBoxManage modifyvm $vmName --boot1 disk --boot2 net