datadir part nsunet-ops-2015-04-17-v03

1 files changed, 2 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 1644d8b..7ebfd17 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -9,6 +9,7 @@ define sunet::etcd_node(
    file { ["/data","/data/${name}","/data/${name}/${::hostname}"]: ensure => 'directory' }
    $common_args = ["--discovery ${disco_url}",
             "--name ${::hostname}",
+            "--data-dir /data",
             "--key-file /etc/ssl/private/${::fqdn}_infra.key",
             "--ca-file /etc/ssl/certs/infra.crt",
             "--cert-file /etc/ssl/certs/${::fqdn}_infra.crt"]
@@ -26,7 +27,7 @@ define sunet::etcd_node(
    sunet::docker_run { "etcd_${name}":
       image            => 'quay.io/coreos/etcd',
       imagetag         => $etcd_version,
-      volumes          => ["/data/${name}:/var/lib/etcd","/etc/ssl:/etc/ssl"],
+      volumes          => ["/data/${name}:/data","/etc/ssl:/etc/ssl"],
       command          => join($args," "),
       ports            => ["${::ipaddress_eth1}:2380:2380","${::ipaddress_eth1}:2379:2379","${::ipaddress_docker0}:4001:2379"]
    }