Merge pull request #10876 from zexi/fix/glance-image-remove

fix(glance): image can't removed when size is 0

pkg/image/models/images.go

@@ -1171,9 +1171,12 @@ func (self *SImage) Remove() error {
 	for i := 0; i < len(subimgs); i += 1 {
 		err := subimgs[i].RemoveFiles()
 		if err != nil {
-			return err
+			return errors.Wrapf(err, "remove subimg %s", subimgs[i].GetName())
 		}
 	}
+	if self.Location == "" {
+		return nil
+	}
 	if strings.HasPrefix(self.Location, LocalFilePrefix) {
 		return self.RemoveFile()
 	} else {