From c1b9e11d22fea5a929f69ff0d29790e74f5652a4 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Fri, 4 Nov 2016 13:01:48 -0500 Subject: [PATCH] UPSTREAM: 36249: fix version detection in openstack lbaas --- .../pkg/cloudprovider/providers/openstack/openstack.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go index 55a4d47271ef..40fc36d5adf6 100644 --- a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go +++ b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go @@ -412,7 +412,7 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) { glog.V(1).Info("Claiming to support LoadBalancer") - if os.lbOpts.LBVersion == "v2" { + if lbversion == "v2" { return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true } else if lbversion == "v1" { return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true