From 1ab589a2d4567865e9389ba8bc7e656ac5220a44 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 14 Apr 2015 12:33:01 +0200
Subject: etcd work

---
 global/overlay/etc/puppet/manifests/cosmos-site.pp             | 1 -
 global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index f76d5dd..8c0800f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -846,7 +846,6 @@ class webbackend {
    class { 'webcommon': }
 }
 
-
 node 'web-a1.sunet.se' {
    sunet::wordpress {'www_sunet_se': }
 }
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 6a61f89..c114cd2 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp
@@ -11,6 +11,6 @@ define sunet::etcd_node(
                            "-discovery ${disco_url}",
                            "-name ${::hostname}",
                            "-data-dir /data/${name}/${::hostname}"],
-      ports            => ["2380:2380"]
+      ports            => ["${::ipaddress_eth1}:2380:2380"]
    }
 }
-- 
cgit v1.1