github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21992 from sky-uk/fix-ebs-volume-instance-lookup

Browse Source 
Fix EBS when hostname is not the node name
This commit is contained in:
Fabio Yeon
2016-02-26 13:21:54 -08:00
parent a7165042af aa65fe8903
commit 90fce905ce
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/aws_ebs/aws_util.go
View File

@@ -177,7 +177,7 @@ func attachDiskAndVerify(b *awsElasticBlockStoreBuilder, xvdBeforeSet sets.Strin
glog.Warningf("Retrying attach for EBS Disk %q (retry count=%v).", b.volumeID, numRetries)
}
devicePath, err := awsCloud.AttachDisk(b.volumeID, b.plugin.host.GetHostName(), b.readOnly)
devicePath, err := awsCloud.AttachDisk(b.volumeID, "", b.readOnly)
if err != nil {
glog.Errorf("Error attaching PD %q: %v", b.volumeID, err)
time.Sleep(errorSleepDuration)
@@ -248,7 +248,7 @@ func detachDiskAndVerify(c *awsElasticBlockStoreCleaner) {
glog.Warningf("Retrying detach for EBS Disk %q (retry count=%v).", c.volumeID, numRetries)
}
devicePath, err := awsCloud.DetachDisk(c.volumeID, c.plugin.host.GetHostName())
devicePath, err := awsCloud.DetachDisk(c.volumeID, "")
if err != nil {
glog.Errorf("Error detaching PD %q: %v", c.volumeID, err)
time.Sleep(errorSleepDuration)