opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit '4890c6aea26a731596f11a6368ea7436dac17231':
  Azure主机名称带上region信息,避免名称重复
This commit is contained in:
邱剑
2018-11-16 17:20:46 +08:00
parent e5d0321695 4890c6aea2
commit 917345a4f7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/azure/classic_host.go
+1 -1
View File
@@ -26,7 +26,7 @@ func (self *SClassicHost) GetId() string {
}
func (self *SClassicHost) GetName() string {
return fmt.Sprintf("%s-classic", self.zone.region.client.subscriptionId)
return fmt.Sprintf("%s/%s-classic", self.zone.region.GetName(), self.zone.region.client.subscriptionId)
}
func (self *SClassicHost) GetGlobalId() string {
pkg/util/azure/host.go
+1 -1
View File
@@ -23,7 +23,7 @@ func (self *SHost) GetId() string {
}
func (self *SHost) GetName() string {
return fmt.Sprintf("%s", self.zone.region.client.subscriptionId)
return fmt.Sprintf("%s/%s", self.zone.region.GetName(), self.zone.region.client.subscriptionId)
}
func (self *SHost) GetGlobalId() string {