silly datadirsunet-ops-2015-04-14-v26

2 files changed, 4 insertions, 4 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 3fe5100..76df3d4 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -860,8 +860,8 @@ class webappserver {
 }
 
 class webbackend {
-   sunet::etcd_node {'etcd':
-      disco_url => 'https://discovery.etcd.io/820b592ab0cde8313d390e5715e4d451'
+   sunet::etcd_node {'sunetweb':
+      disco_url => 'https://discovery.etcd.io/53d3ba1275a50941eb30b3f11debb961'
    }
    class { 'webcommon': }
 }
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 22b26a7..a01d60b 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -7,8 +7,8 @@ define sunet::etcd_node(
    sunet::docker_run { "etcd_${name}":
       image            => 'quay.io/coreos/etcd',
       imagetag         => $etcd_version,
-      volumes          => ["/data/${name}/${::hostname}:/data","/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} --data-dir /data --name ${::hostname} --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",
+      volumes          => ["/data/${name}:/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} --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"]
    }
 }