From 3d1ab0bddf7929b94fafdc8347e96c992c93ffff Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 14 Apr 2015 12:47:11 +0200
Subject: etc foo

---
 global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'global/overlay')

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"]
    }
 }
-- 
cgit v1.1