summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-14 12:33:01 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-14 12:33:01 +0200
commit1ab589a2d4567865e9389ba8bc7e656ac5220a44 (patch)
treeb834524c0f47c14b52bad27ab31fcc1141f21352
parentb0966eb8093966c341bb92e2ba2c2a7713ec37d0 (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp1
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp2
2 files changed, 1 insertions, 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"]
}
}