rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Do not use the previous network settings on DigitalOcean

Browse Source
This commit is contained in:
niusmallnan
2019-01-10 16:20:57 +08:00
committed by niusmallnan
parent 41277f7ca5
commit 03deff471e
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/init/cloudinit/cloudinit.go
View File

@@ -62,11 +62,18 @@ func CloudInit(cfg *config.CloudConfig) (*config.CloudConfig, error) {
}
if len(stateConfig.Rancher.Network.Interfaces) > 0 {
// DO also uses static networking, but this IP may change if:
// 1. not using Floating IP
// 2. creating a droplet with a snapshot, the snapshot cached the previous IP
if onlyDigitalOcean(cfg.Rancher.CloudInit.Datasources) {
log.Info("Do not use the previous network settings on DigitalOcean")
} else {
cfg.Rancher.Network = stateConfig.Rancher.Network
if err := config.Set("rancher.network", stateConfig.Rancher.Network); err != nil {
log.Error(err)
}
}
}
log.Infof("init, runCloudInitServices(%v)", cfg.Rancher.CloudInit.Datasources)
if err := runCloudInitServices(cfg); err != nil {
@@ -113,3 +120,16 @@ func onlyConfigDrive(datasources []string) bool {
}
return false
}
func onlyDigitalOcean(datasources []string) bool {
if len(datasources) != 1 {
return false
}
for _, ds := range datasources {
parts := strings.SplitN(ds, ":", 2)
if parts[0] == "digitalocean" {
return true
}
}
return false
}