summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-16 23:50:35 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-16 23:50:35 +0200
commit9df927868a9c66f4ba568dc33ec925eed079baaa (patch)
treea0c634e3a866f087307d149c5d9fce18049d7043
parentfcc7ab131530166ea997a238aac7bf6182f5f6de (diff)
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp7
1 files changed, 3 insertions, 4 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
index 97927b4..6b3898f 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -13,16 +13,15 @@ define sunet::etcd_node(
"--ca-file /etc/ssl/certs/infra.crt",
"--cert-file /etc/ssl/certs/${::fqdn}_infra.crt"]
if $proxy {
- $args = concat($args,["--proxy on","--listen-client-urls http://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"])
+ $args += ["--proxy on","--listen-client-urls http://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"]
} else {
- $args = concat($args,
- ["--initial-advertise-peer-urls http://${::ipaddress_eth1}:2380",
+ $args += ["--initial-advertise-peer-urls http://${::ipaddress_eth1}:2380",
"--advertise-client-urls http://${::ipaddress_eth1}:2379",
"--listen-peer-urls http://0.0.0.0:2380",
"--listen-client-urls http://0.0.0.0:2379,http://${::ipaddress_docker0}:2379",
"--peer-key-file /etc/ssl/private/${::fqdn}_infra.key",
"--peer-ca-file /etc/ssl/certs/infra.crt",
- "--peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt"])
+ "--peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt"]
}
sunet::docker_run { "etcd_${name}":
image => 'quay.io/coreos/etcd',