diff --git a/controllers/cindervolume_controller.go b/controllers/cindervolume_controller.go index 34d0fd15..e9b20b22 100644 --- a/controllers/cindervolume_controller.go +++ b/controllers/cindervolume_controller.go @@ -676,7 +676,7 @@ func processCustomServiceConfig(customServiceConfig string) (bool, string) { backendNames = append(backendNames, sectionName) } else if token == "volume_driver" { - numDrivers += 1 + numDrivers++ if strings.HasSuffix(line, ".LVMVolumeDriver") { usesLVM = true } diff --git a/pkg/cinder/funcs.go b/pkg/cinder/funcs.go index 16fc0ae7..b9f77797 100644 --- a/pkg/cinder/funcs.go +++ b/pkg/cinder/funcs.go @@ -19,9 +19,9 @@ func GetNetworkAttachmentAddrs(namespace string, networkAttachments []string, ne networkAttachmentAddrs := []string{} for _, network := range networkAttachments { - network_name := namespace + "/" + network - if network_addrs, ok := networkAttachmentStatus[network_name]; ok { - networkAttachmentAddrs = append(networkAttachmentAddrs, network_addrs...) + networkName := namespace + "/" + network + if networkAddrs, ok := networkAttachmentStatus[networkName]; ok { + networkAttachmentAddrs = append(networkAttachmentAddrs, networkAddrs...) } } diff --git a/pkg/cindervolume/const.go b/pkg/cindervolume/const.go index 0d221d9b..3217a353 100644 --- a/pkg/cindervolume/const.go +++ b/pkg/cindervolume/const.go @@ -18,5 +18,6 @@ package cindervolume const ( // Component - Component = "cinder-volume" - Backend = "backend" + // Backend - + Backend = "backend" )