From 7dce4d54c1ee591db6999d5c1ec402b824ae1182 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Sat, 29 Oct 2016 21:22:53 -0700
Subject: [PATCH 1/2] Support list types for engine opts

---
 config/docker_config.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/docker_config.go b/config/docker_config.go
index 664aad80..ec600158 100644
--- a/config/docker_config.go
+++ b/config/docker_config.go
@@ -41,6 +41,10 @@ func generateEngineOptsSlice(opts EngineOpts) []string {
 					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:
 			for k, v := range value {
 				optsSlice = append(optsSlice, fmt.Sprintf("--%s", optTag), fmt.Sprintf("%s=%s", k, v))

From 57018249a6b88763a53d9a746cba3df4d4e42683 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Sun, 30 Oct 2016 12:07:55 -0700
Subject: [PATCH 2/2] Change host engine opt type to list

---
 config/docker_config_test.go | 7 +++++++
 config/types.go              | 2 +-
 os-config.tpl.yml            | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config/docker_config_test.go b/config/docker_config_test.go
index 853669a3..adccf21b 100644
--- a/config/docker_config_test.go
+++ b/config/docker_config_test.go
@@ -30,6 +30,13 @@ func TestGenerateEngineOptsString(t *testing.T) {
 		SelinuxEnabled: &[]bool{false}[0],
 	})), "--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{
 		LogOpts: map[string]string{
 			"max-size": "25m",
diff --git a/config/types.go b/config/types.go
index f8d5a4f7..33700668 100644
--- a/config/types.go
+++ b/config/types.go
@@ -140,7 +140,7 @@ type EngineOpts struct {
 	ExecRoot       string            `yaml:"exec_root,omitempty" opt:"exec-root"`
 	Group          string            `yaml:"group,omitempty" opt:"group"`
 	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"`
 	LogDriver      string            `yaml:"log_driver,omitempty" opt:"log-driver"`
 	LogOpts        map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"`
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 7109f299..5426fb6a 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -36,7 +36,7 @@ rancher:
     restart: false
     graph: /var/lib/system-docker
     group: root
-    host: "unix:///var/run/system-docker.sock"
+    host: ["unix:///var/run/system-docker.sock"]
     userland_proxy: false
   console: default
   cloud_init:
@@ -341,7 +341,7 @@ rancher:
     restart: false
     graph: /var/lib/system-docker
     group: root
-    host: "unix:///var/run/system-docker.sock"
+    host: ["unix:///var/run/system-docker.sock"]
     pid_file: /var/run/system-docker.pid
     exec_root: /var/run/system-docker
     config_file: /etc/docker/system-docker.json
@@ -360,7 +360,7 @@ rancher:
     {{end -}}
     storage_driver: overlay
     group: docker
-    host: "unix:///var/run/docker.sock"
+    host: ["unix:///var/run/docker.sock"]
     log_opts:
       max-size: 25m
       max-file: 2