From dcebf3bc80ef6fdac21fc679e7d7f90e675c6efe Mon Sep 17 00:00:00 2001 From: Julian Edwards Date: Wed, 11 Oct 2017 13:28:31 +1000 Subject: [PATCH] Fix failures preventing VM netboots - Remove Etcd config from dir-sot.yaml which clases with LocalDir (#41) - Change NIC ordering so the right MAC is sent with the pxe request (#42) --- config/dir-sot.yaml | 17 ++++++++++------- create_cluster/cluster.sh | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/config/dir-sot.yaml b/config/dir-sot.yaml index b148236..c13b7c9 100644 --- a/config/dir-sot.yaml +++ b/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 diff --git a/create_cluster/cluster.sh b/create_cluster/cluster.sh index 71a5b44..bb41728 100755 --- a/create_cluster/cluster.sh +++ b/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