summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-14 13:20:22 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-14 13:20:22 +0200
commitae85c78ff1901412ba960d0aa14b80a6cac22802 (patch)
tree07ea6799722d257f18bea4f519ade952451cc30c /global
parentff2916e6ad9f1332ead817cc943588814a489f75 (diff)
infra ca & etc tls configsunet-ops-2015-04-14-v14
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp2
1 files changed, 1 insertions, 1 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 3509114..ee0966f 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -7,7 +7,7 @@ define sunet::etcd_node(
sunet::docker_run { "etcd_${name}":
image => 'quay.io/coreos/etcd',
imagetag => $etcd_version,
- volumes => ["/data/${name}/${::hostname}:/var/lib/etcd","/etc/ssl:/etc/ssl"]
+ volumes => ["/data/${name}/${::hostname}:/var/lib/etcd","/etc/ssl:/etc/ssl"],
command => "--initial-advertise-peer-urls http://0.0.0.0:2380 --listen-peer-urls http://0.0.0.0:2380 --discovery ${disco_url} --name ${::hostname} --data-dir /var/lib/etcd --key-file /etc/ssl/private/${::fqdn}_infra.key --peer-key-file /etc/ssl/private/${::fqdn}_infra.key --ca-file /etc/ssl/certs/infra.crt --peer-ca-file /etc/ssl/certs/infra.crt --cert-file /etc/ssl/certs/${::fqdn}_infra.crt --peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt",
ports => ["${::ipaddress_eth1}:2380:2380"]
}