From cec8973975e5f2ca573d1dca814398a22bdc8458 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 24 Feb 2015 10:20:47 -0500 Subject: [PATCH 1/3] add swarm label of provider by default Signed-off-by: Evan Hazlett --- host.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/host.go b/host.go index 2b9ca0666b..fc2ddbd2fb 100644 --- a/host.go +++ b/host.go @@ -322,16 +322,19 @@ func (h *Host) generateDockerConfig(dockerPort int, caCertPath string, serverKey daemonOpts string daemonOptsCfg string daemonCfg string + swarmLabels = []string{} ) - // TODO @ehazlett: template? + if h.SwarmHost != "" { + swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName())) + } + defaultDaemonOpts := fmt.Sprintf(`--tlsverify \ --tlscacert=%s \ --tlskey=%s \ ---tlscert=%s`, caCertPath, serverKeyPath, serverCertPath) +--tlscert=%s %s`, caCertPath, serverKeyPath, serverCertPath, strings.Join(swarmLabels, " ")) switch d.DriverName() { - case "virtualbox", "vmwarefusion", "vmwarevsphere", "hyper-v": daemonOpts = fmt.Sprintf("-H tcp://0.0.0.0:%d", dockerPort) daemonOptsCfg = path.Join(d.GetDockerConfigDir(), "profile") From 06c1c5cbeb5c2fd80e8268f6a5113e5a6b8b9613 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 24 Feb 2015 14:37:00 -0500 Subject: [PATCH 2/3] use swarm labels as default Signed-off-by: Evan Hazlett --- host.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/host.go b/host.go index fc2ddbd2fb..310f41c52f 100644 --- a/host.go +++ b/host.go @@ -325,9 +325,7 @@ func (h *Host) generateDockerConfig(dockerPort int, caCertPath string, serverKey swarmLabels = []string{} ) - if h.SwarmHost != "" { - swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName())) - } + swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName())) defaultDaemonOpts := fmt.Sprintf(`--tlsverify \ --tlscacert=%s \ From 348be4d325831a7ff2dcb9ca3f069bdb81a752fe Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 24 Feb 2015 14:52:19 -0500 Subject: [PATCH 3/3] formatting from feedback from sthulb Signed-off-by: Evan Hazlett --- host.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/host.go b/host.go index 310f41c52f..9c97925573 100644 --- a/host.go +++ b/host.go @@ -327,10 +327,12 @@ func (h *Host) generateDockerConfig(dockerPort int, caCertPath string, serverKey swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName())) - defaultDaemonOpts := fmt.Sprintf(`--tlsverify \ ---tlscacert=%s \ ---tlskey=%s \ ---tlscert=%s %s`, caCertPath, serverKeyPath, serverCertPath, strings.Join(swarmLabels, " ")) + defaultDaemonOpts := fmt.Sprintf(`--tlsverify --tlscacert=%s --tlskey=%s --tlscert=%s %s`, + caCertPath, + serverKeyPath, + serverCertPath, + strings.Join(swarmLabels, " "), + ) switch d.DriverName() { case "virtualbox", "vmwarefusion", "vmwarevsphere", "hyper-v":