opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.6.0 -> release/2.7.0

Browse Source 
* commit 'c759d5ae1d21ff6d5df13dcb4c8b51289025e342':
  fix: aws sync metadata ignoring errors
This commit is contained in:
邱剑
2019-03-23 10:20:48 +08:00
parent cd84b61b67 c759d5ae1d
commit e1a3f5b2e0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/instance.go
+7 -5
View File
@@ -163,18 +163,20 @@ func (self *SInstance) GetMetadata() *jsonutils.JSONDict {
tags, err := FetchTags(self.host.zone.region.ec2Client, self.InstanceId)
if err != nil {
log.Errorf(err.Error())
} else {
data.Update(tags)
}
data.Update(tags)
data.Add(jsonutils.NewString(self.host.zone.GetGlobalId()), "zone_ext_id")
if len(self.ImageId) > 0 {
image, err := self.host.zone.region.GetImage(self.ImageId)
if err != nil {
log.Errorf("Failed to find image %s for instance %s zone %s", self.ImageId, self.GetId(), self.ZoneId)
}
meta := image.GetMetadata()
if meta != nil {
data.Update(meta)
} else {
meta := image.GetMetadata()
if meta != nil {
data.Update(meta)
}
}
}
secgroupIds := jsonutils.NewArray()