x
/
k8s-cloud-provider
Code Issues Proposed changes

fix variables in openstack.go to keep camel casing and remove unused var

This commit is contained in:
NickrenREN 2017-01-11 20:14:01 +08:00
parent 4c46daf16c
commit 2faaa7d45a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/cloudprovider/providers/openstack/openstack.go
View File

@ -46,7 +46,6 @@ const ProviderName = "openstack"
var ErrNotFound = errors.New("Failed to find object") var ErrNotFound = errors.New("Failed to find object")
var ErrMultipleResults = errors.New("Multiple results where only one expected") var ErrMultipleResults = errors.New("Multiple results where only one expected")
var ErrNoAddressFound = errors.New("No address found for host") var ErrNoAddressFound = errors.New("No address found for host")
var ErrAttrNotFound = errors.New("Expected attribute not found")
const ( const (
MiB = 1024 * 1024 MiB = 1024 * 1024
@ -316,8 +315,8 @@ func nodeAddresses(srv *servers.Server) ([]v1.NodeAddress, error) {
return nil, err return nil, err
} }
for network, addrlist := range addresses { for network, addrList := range addresses {
for _, props := range addrlist { for _, props := range addrList {
var addressType v1.NodeAddressType var addressType v1.NodeAddressType
if props.IpType == "floating" || network == "public" { if props.IpType == "floating" || network == "public" {
addressType = v1.NodeExternalIP addressType = v1.NodeExternalIP
@ -392,8 +391,8 @@ func (os *OpenStack) ProviderName() string {
} }
// ScrubDNS filters DNS settings for pods. // ScrubDNS filters DNS settings for pods.
func (os *OpenStack) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) { func (os *OpenStack) ScrubDNS(nameServers, searches []string) ([]string, []string) {
return nameservers, searches return nameServers, searches
} }
func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) { func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
@ -416,8 +415,8 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
return nil, false return nil, false
} }
lbversion := os.lbOpts.LBVersion lbVersion := os.lbOpts.LBVersion
if lbversion == "" { if lbVersion == "" {
// No version specified, try newest supported by server // No version specified, try newest supported by server
netExts, err := networkExtensions(network) netExts, err := networkExtensions(network)
if err != nil { if err != nil {
@ -426,24 +425,24 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
} }
if netExts["lbaasv2"] { if netExts["lbaasv2"] {
lbversion = "v2" lbVersion = "v2"
} else if netExts["lbaas"] { } else if netExts["lbaas"] {
lbversion = "v1" lbVersion = "v1"
} else { } else {
glog.Warningf("Failed to find neutron LBaaS extension (v1 or v2)") glog.Warningf("Failed to find neutron LBaaS extension (v1 or v2)")
return nil, false return nil, false
} }
glog.V(3).Infof("Using LBaaS extension %v", lbversion) glog.V(3).Infof("Using LBaaS extension %v", lbVersion)
} }
glog.V(1).Info("Claiming to support LoadBalancer") glog.V(1).Info("Claiming to support LoadBalancer")
if lbversion == "v2" { if lbVersion == "v2" {
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
} else if lbversion == "v1" { } else if lbVersion == "v1" {
return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
} else { } else {
glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbversion) glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbVersion)
return nil, false return nil, false
} }
} }