rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-18 17:11:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1355 from joshwget/host-list

Browse Source 
Change host engine opt type to list
This commit is contained in:
Sven Dowideit 2016-11-03 09:39:05 +10:00 committed by GitHub
commit eb3f7fc9aa
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/docker_config.go
View File

@ -41,6 +41,10 @@ func generateEngineOptsSlice(opts EngineOpts) []string {
optsSlice = append(optsSlice, fmt.Sprintf("--%s=false", optTag)) optsSlice = append(optsSlice, fmt.Sprintf("--%s=false", optTag))
} }
} }
case []string:
for _, elem := range value {
optsSlice = append(optsSlice, fmt.Sprintf("--%s", optTag), elem)
}
case map[string]string: case map[string]string:
for k, v := range value { for k, v := range value {
optsSlice = append(optsSlice, fmt.Sprintf("--%s", optTag), fmt.Sprintf("%s=%s", k, v)) optsSlice = append(optsSlice, fmt.Sprintf("--%s", optTag), fmt.Sprintf("%s=%s", k, v))

7
config/docker_config_test.go
View File

@ -30,6 +30,13 @@ func TestGenerateEngineOptsString(t *testing.T) {
SelinuxEnabled: &[]bool{false}[0], SelinuxEnabled: &[]bool{false}[0],
})), "--selinux-enabled=false") })), "--selinux-enabled=false")
testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
Host: []string{
"unix:///var/run/system-docker.sock",
"unix:///var/run/docker.sock",
},
})), "--host unix:///var/run/system-docker.sock", "--host unix:///var/run/docker.sock")
testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{ testContains(t, fmt.Sprint(generateEngineOptsSlice(EngineOpts{
LogOpts: map[string]string{ LogOpts: map[string]string{
"max-size": "25m", "max-size": "25m",

2
config/types.go
View File

@ -140,7 +140,7 @@ type EngineOpts struct {
ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"` ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"`
Group string `yaml:"group,omitempty" opt:"group"` Group string `yaml:"group,omitempty" opt:"group"`
Graph string `yaml:"graph,omitempty" opt:"graph"` Graph string `yaml:"graph,omitempty" opt:"graph"`
Host string `yaml:"host,omitempty" opt:"host"` Host []string `yaml:"host,omitempty" opt:"host"`
LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"` LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"`
LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"` LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"`
LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"` LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"`

6
os-config.tpl.yml
View File

@ -36,7 +36,7 @@ rancher:
restart: false restart: false
graph: /var/lib/system-docker graph: /var/lib/system-docker
group: root group: root
host: "unix:///var/run/system-docker.sock" host: ["unix:///var/run/system-docker.sock"]
userland_proxy: false userland_proxy: false
console: default console: default
cloud_init: cloud_init:
@ -336,7 +336,7 @@ rancher:
restart: false restart: false
graph: /var/lib/system-docker graph: /var/lib/system-docker
group: root group: root
host: "unix:///var/run/system-docker.sock" host: ["unix:///var/run/system-docker.sock"]
pid_file: /var/run/system-docker.pid pid_file: /var/run/system-docker.pid
exec_root: /var/run/system-docker exec_root: /var/run/system-docker
config_file: /etc/docker/system-docker.json config_file: /etc/docker/system-docker.json
@ -355,7 +355,7 @@ rancher:
{{end -}} {{end -}}
storage_driver: overlay storage_driver: overlay
group: docker group: docker
host: "unix:///var/run/docker.sock" host: ["unix:///var/run/docker.sock"]
log_opts: log_opts:
max-size: 25m max-size: 25m
max-file: 2 max-file: 2