Make the logs path of system-docker configurable

Author: niusmallnan

config/schema.go

@@ -196,7 +196,8 @@ var schema = `{
 			"properties": {
 				"hostname": {"type": "string"},
 				"docker": {"type": "object"},
-				"network": {"$ref": "#/definitions/network_config"}
+				"network": {"$ref": "#/definitions/network_config"},
+				"system_docker_logs": {"type": "string"}
 			}
 		},
 

config/types.go

@@ -23,7 +23,6 @@ const (
 	InitImages       = "images-init.tar"
 	SystemImages     = "images-system.tar"
 	Debug            = false
-	SystemDockerLog  = "/var/log/system-docker.log"
 	SystemDockerBin  = "/usr/bin/system-dockerd"
 
 	DetachLabel        = "io.rancher.os.detach"
@@ -215,9 +214,10 @@ type CloudInit struct {
 }
 
 type Defaults struct {
-	Hostname string                `yaml:"hostname,omitempty"`
-	Docker   DockerConfig          `yaml:"docker,omitempty"`
-	Network  netconf.NetworkConfig `yaml:"network,omitempty"`
+	Hostname         string                `yaml:"hostname,omitempty"`
+	Docker           DockerConfig          `yaml:"docker,omitempty"`
+	Network          netconf.NetworkConfig `yaml:"network,omitempty"`
+	SystemDockerLogs string                `yaml:"system_docker_logs,omitempty"`
 }
 
 func (r Repositories) ToArray() []string {

os-config.tpl.yml

@@ -16,6 +16,7 @@ rancher:
     network:
       dns:
         nameservers: [8.8.8.8, 8.8.4.4]
+    system_docker_logs: /var/log/system-docker.log
   ssh:
     daemon: true
   hypervisor_service: true

pkg/init/docker/docker.go

@@ -46,7 +46,7 @@ func GetLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*
 	launchConfig.Environment = dockerCfg.Environment
 
 	if !cfg.Rancher.Debug {
-		launchConfig.LogFile = config.SystemDockerLog
+		launchConfig.LogFile = cfg.Rancher.Defaults.SystemDockerLogs
 	}
 
 	return &launchConfig, args