rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-08 12:28:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2067 from SvenDowideit/remove-hypervisor-yml-check

Browse Source 
Remove the hypervisor yml file check, there's a cert problem on first…
This commit is contained in:
Sven Dowideit 2017-08-30 09:39:40 +10:00 committed by GitHub
commit 7e7c134a80
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
init/init.go
View File

@ -13,7 +13,6 @@ import (
"syscall" "syscall"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/rancher/os/cmd/control/service"
"github.com/rancher/os/config" "github.com/rancher/os/config"
"github.com/rancher/os/dfs" "github.com/rancher/os/dfs"
"github.com/rancher/os/log" "github.com/rancher/os/log"
@ -486,13 +485,14 @@ func enableHypervisorService(cfg *config.CloudConfig, hypervisorName string) {
return return
} }
// Check removed - there's an x509 cert failure on first boot of an installed system
// check quickly to see if there is a yml file available // check quickly to see if there is a yml file available
if service.ValidService(serviceName, cfg) { // if service.ValidService(serviceName, cfg) {
log.Infof("Setting rancher.services_include. %s=true", serviceName) log.Infof("Setting rancher.services_include. %s=true", serviceName)
if err := config.Set("rancher.services_include."+serviceName, "true"); err != nil { if err := config.Set("rancher.services_include."+serviceName, "true"); err != nil {
log.Error(err) log.Error(err)
}
} else {
log.Infof("Skipping %s, can't get %s.yml file", serviceName, serviceName)
} }
// } else {
// log.Infof("Skipping %s, can't get %s.yml file", serviceName, serviceName)
// }
} }