github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #50206 from FengyunPan/add-debug 

Automatic merge from submit-queue (batch tested with PRs 49524, 46760, 50206, 50166, 49603)

[OpenStack] Add more detail error message

I get same simple error messages "Unable to initialize cinder client
for region: RegionOne" from controller-manager, but I can not find the
reason. We should add more detail message "err" into glog.Errorf.

Currently NewBlockStorageV2() return err when failed to get cinder endpoint, but there is no code to output the message of err.

**Release note**:
```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-07 13:52:00 -07:00 committed by GitHub
parent 535c0f6ff4 1ff8e12a24
commit 57cbc67cd8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/openstack/openstack_client.go
View File

@ -28,7 +28,7 @@ func (os *OpenStack) NewNetworkV2() (*gophercloud.ServiceClient, error) {
Region: os.region,
})
if err != nil {
glog.Warningf("Failed to find network v2 endpoint: %v", err)
glog.Warningf("Failed to find network v2 endpoint for region %s: %v", os.region, err)
return nil, err
}
return network, nil
@ -39,7 +39,7 @@ func (os *OpenStack) NewComputeV2() (*gophercloud.ServiceClient, error) {
Region: os.region,
})
if err != nil {
glog.Warningf("Failed to find compute v2 endpoint: %v", err)
glog.Warningf("Failed to find compute v2 endpoint for region %s: %v", os.region, err)
return nil, err
}
return compute, nil
@ -50,7 +50,7 @@ func (os *OpenStack) NewBlockStorageV1() (*gophercloud.ServiceClient, error) {
Region: os.region,
})
if err != nil {
glog.Errorf("Unable to initialize cinder v1 client for region: %s", os.region)
glog.Errorf("Unable to initialize cinder v1 client for region %s: %v", os.region, err)
return nil, err
}
return storage, nil
@ -61,7 +61,7 @@ func (os *OpenStack) NewBlockStorageV2() (*gophercloud.ServiceClient, error) {
Region: os.region,
})
if err != nil {
glog.Errorf("Unable to initialize cinder v2 client for region: %s", os.region)
glog.Errorf("Unable to initialize cinder v2 client for region %s: %v", os.region, err)
return nil, err
}
return storage, nil