summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-14 12:47:11 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-14 12:47:11 +0200
commit3d1ab0bddf7929b94fafdc8347e96c992c93ffff (patch)
treec43c6703b46c6054a8046a092d385b753a6ce4f7
parent1ab589a2d4567865e9389ba8bc7e656ac5220a44 (diff)
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp9
1 files changed, 3 insertions, 6 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 c114cd2..3d17691 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -1,16 +1,13 @@
define sunet::etcd_node(
$disco_url = undef,
$etcd_version = 'v2.0.8'
-) {
+)
+{
file { ["/data","/data/${name}","/data/${name}/${::hostname}"]: ensure => 'directory' }
sunet::docker_run { "etcd_${name}":
image => 'quay.io/coreos/etcd',
imagetag => $etcd_version,
- extra_parameters => ["-initial-advertise-peer-urls http://${::ipaddress_eth1}:2380",
- "-listen-peer-urls http://${::ipaddress_eth1}:2380",
- "-discovery ${disco_url}",
- "-name ${::hostname}",
- "-data-dir /data/${name}/${::hostname}"],
+ command => "-initial-advertise-peer-urls http://${::ipaddress_eth1}:2380 -listen-peer-urls http://${::ipaddress_eth1}:2380 -discovery ${disco_url} -name ${::hostname} -data-dir /data/${name}/${::hostname}",
ports => ["${::ipaddress_eth1}:2380:2380"]
}
}