rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-08 02:01:27 +00:00
Code Issues Releases Wiki Activity

Disable cloud-int if necessary

Browse Source
This commit is contained in:
niusmallnan
2018-11-12 13:59:00 +08:00
committed by niusmallnan
parent a840016ffd
commit 8f19420774
1 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,9 @@
package cloudinit package cloudinit
import ( import (
"path/filepath"
"strings"
"github.com/rancher/os/config" "github.com/rancher/os/config"
"github.com/rancher/os/pkg/compose" "github.com/rancher/os/pkg/compose"
"github.com/rancher/os/pkg/init/docker" "github.com/rancher/os/pkg/init/docker"
@@ -13,6 +16,37 @@ func CloudInit(cfg *config.CloudConfig) (*config.CloudConfig, error) {
stateConfig := config.LoadConfigWithPrefix(config.StateDir) stateConfig := config.LoadConfigWithPrefix(config.StateDir)
cfg.Rancher.CloudInit.Datasources = stateConfig.Rancher.CloudInit.Datasources cfg.Rancher.CloudInit.Datasources = stateConfig.Rancher.CloudInit.Datasources
hypervisor := util.GetHypervisor()
if hypervisor == "" {
log.Infof("ros init: No Detected Hypervisor")
} else {
log.Infof("ros init: Detected Hypervisor: %s", hypervisor)
}
if hypervisor == "vmware" {
// add vmware to the end - we don't want to over-ride an choices the user has made
cfg.Rancher.CloudInit.Datasources = append(cfg.Rancher.CloudInit.Datasources, hypervisor)
}
if len(cfg.Rancher.CloudInit.Datasources) == 0 {
log.Info("No specific datasources, ignore cloudinit")
return cfg, nil
}
if onlyConfigDrive(cfg.Rancher.CloudInit.Datasources) {
configDev := util.ResolveDevice("LABEL=config-2")
if configDev == "" {
// Check v9fs: https://www.kernel.org/doc/Documentation/filesystems/9p.txt
matches, _ := filepath.Glob("/sys/bus/virtio/drivers/9pnet_virtio/virtio*/mount_tag")
if len(matches) == 0 {
log.Info("Configdrive was enabled but has no configdrive device or filesystem, ignore cloudinit")
return cfg, nil
}
}
}
if err := config.Set("rancher.cloud_init.datasources", cfg.Rancher.CloudInit.Datasources); err != nil {
log.Error(err)
}
if stateConfig.Rancher.Network.DHCPTimeout > 0 { if stateConfig.Rancher.Network.DHCPTimeout > 0 {
cfg.Rancher.Network.DHCPTimeout = stateConfig.Rancher.Network.DHCPTimeout cfg.Rancher.Network.DHCPTimeout = stateConfig.Rancher.Network.DHCPTimeout
if err := config.Set("rancher.network.dhcp_timeout", stateConfig.Rancher.Network.DHCPTimeout); err != nil { if err := config.Set("rancher.network.dhcp_timeout", stateConfig.Rancher.Network.DHCPTimeout); err != nil {
@@ -34,21 +68,6 @@ func CloudInit(cfg *config.CloudConfig) (*config.CloudConfig, error) {
} }
} }
hypervisor := util.GetHypervisor()
if hypervisor == "" {
log.Infof("ros init: No Detected Hypervisor")
} else {
log.Infof("ros init: Detected Hypervisor: %s", hypervisor)
}
if hypervisor == "vmware" {
// add vmware to the end - we don't want to over-ride an choices the user has made
cfg.Rancher.CloudInit.Datasources = append(cfg.Rancher.CloudInit.Datasources, hypervisor)
}
if err := config.Set("rancher.cloud_init.datasources", cfg.Rancher.CloudInit.Datasources); err != nil {
log.Error(err)
}
log.Infof("init, runCloudInitServices(%v)", cfg.Rancher.CloudInit.Datasources) log.Infof("init, runCloudInitServices(%v)", cfg.Rancher.CloudInit.Datasources)
if err := runCloudInitServices(cfg); err != nil { if err := runCloudInitServices(cfg); err != nil {
log.Error(err) log.Error(err)
@@ -81,3 +100,16 @@ func runCloudInitServiceSet(cfg *config.CloudConfig) (*config.CloudConfig, error
_, err := compose.RunServiceSet("cloud-init", cfg, cfg.Rancher.CloudInitServices) _, err := compose.RunServiceSet("cloud-init", cfg, cfg.Rancher.CloudInitServices)
return cfg, err return cfg, err
} }
func onlyConfigDrive(datasources []string) bool {
if len(datasources) != 1 {
return false
}
for _, ds := range datasources {
parts := strings.SplitN(ds, ":", 2)
if parts[0] == "configdrive" {
return true
}
}
return false
}