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

Rename addon to service

Browse Source
This commit is contained in:
Darren Shepherd
2015-04-06 07:28:17 -07:00
parent 8d9d941fee
commit bedb10c85e
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
init/sysinit.go
View File

@@ -125,32 +125,32 @@ func runServices(name string, cfg *config.Config, configs map[string]*project.Se
return err
}
for _, addon := range cfg.EnabledAddons {
if _, ok := enabled[addon]; ok {
for _, service := range cfg.EnabledServices {
if _, ok := enabled[service]; ok {
continue
}
if config, ok := cfg.Addons[addon]; ok {
if config, ok := cfg.Services[service]; ok {
for name, s := range config.SystemContainers {
if err := project.AddConfig(name, s); err != nil {
log.Errorf("Failed to load %s : %v", name, err)
}
}
} else {
bytes, err := util.LoadResource(addon)
bytes, err := util.LoadResource(service)
if err != nil {
log.Errorf("Failed to load %s : %v", addon, err)
log.Errorf("Failed to load %s : %v", service, err)
continue
}
err = project.Load(bytes)
if err != nil {
log.Errorf("Failed to load %s : %v", addon, err)
log.Errorf("Failed to load %s : %v", service, err)
continue
}
}
enabled[addon] = true
enabled[service] = true
}
return nil