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

Merge pull request #2175 from niusmallnan/issues-2168

Browse Source 
Only enable open-vm-tools serivce for vmware
This commit is contained in:
niusmallnan
2017-12-13 10:46:51 +08:00
committed by GitHub
parent d79e5e8753 c47e8c5bf7
commit bbe86be115
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/init.go
View File

@@ -486,9 +486,10 @@ func enableHypervisorService(cfg *config.CloudConfig, hypervisorName string) {
return return
} }
// only enable open-vm-tools for vmware
// these services(xenhvm-vm-tools, kvm-vm-tools, hyperv-vm-tools and bhyve-vm-tools) don't exist yet
if hypervisorName == "vmware" { if hypervisorName == "vmware" {
hypervisorName = "open" hypervisorName = "open"
}
serviceName := hypervisorName + "-vm-tools" serviceName := hypervisorName + "-vm-tools"
if !cfg.Rancher.HypervisorService { if !cfg.Rancher.HypervisorService {
log.Infof("Skipping %s as `rancher.hypervisor_service` is set to false", serviceName) log.Infof("Skipping %s as `rancher.hypervisor_service` is set to false", serviceName)
@@ -506,3 +507,4 @@ func enableHypervisorService(cfg *config.CloudConfig, hypervisorName string) {
// log.Infof("Skipping %s, can't get %s.yml file", serviceName, serviceName) // log.Infof("Skipping %s, can't get %s.yml file", serviceName, serviceName)
// } // }
} }
}