From bb0bc660cf407cd7001463ceda3095ab04ccab28 Mon Sep 17 00:00:00 2001 From: Ritesh H Shukla Date: Fri, 14 Oct 2016 21:42:04 +0000 Subject: [PATCH 1/2] Use fixed release for salt to avoid regression in release post 2016.3.2 --- cluster/vsphere/templates/salt-master.sh | 2 +- cluster/vsphere/templates/salt-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/vsphere/templates/salt-master.sh b/cluster/vsphere/templates/salt-master.sh index 82ea5a25890..871b715d280 100755 --- a/cluster/vsphere/templates/salt-master.sh +++ b/cluster/vsphere/templates/salt-master.sh @@ -70,5 +70,5 @@ EOF # # -M installs the master set +x -curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M -X +curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -M -X stable 2016.3.2 set -x diff --git a/cluster/vsphere/templates/salt-minion.sh b/cluster/vsphere/templates/salt-minion.sh index 7ccf9e6c0f1..2b4e40d725c 100755 --- a/cluster/vsphere/templates/salt-minion.sh +++ b/cluster/vsphere/templates/salt-minion.sh @@ -65,4 +65,4 @@ EOF # # We specify -X to avoid a race condition that can cause minion failure to # install. See https://github.com/saltstack/salt-bootstrap/issues/270 -curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X +curl -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- -X stable 2016.3.2 From 26db528da30bfbfe0071616cf79efa6fc0c7299c Mon Sep 17 00:00:00 2001 From: Ritesh H Shukla Date: Mon, 17 Oct 2016 23:42:59 +0000 Subject: [PATCH 2/2] Fix panic in vSphere when deploying on a single ESX node. Use ComputeResource instead of ClusterComputeResource when initializing the vSphere Cloud Provider --- pkg/cloudprovider/providers/vsphere/vsphere.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cloudprovider/providers/vsphere/vsphere.go b/pkg/cloudprovider/providers/vsphere/vsphere.go index 1ecb49ccd03..a3dae8e1d9c 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere.go @@ -252,7 +252,7 @@ func readInstance(cfg *VSphereConfig) (string, string, error) { var rp mo.ResourcePool err = s.Properties(ctx, *vm.ResourcePool, []string{"parent"}, &rp) if err == nil { - var ccr mo.ClusterComputeResource + var ccr mo.ComputeResource err = s.Properties(ctx, *rp.Parent, []string{"name"}, &ccr) if err == nil { cluster = ccr.Name