diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-04-17 00:10:06 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-04-17 00:10:06 +0200 |
| commit | cb8a3cc80f6f5d08762fb30108f398bfd25a0eb1 (patch) | |
| tree | 79a47a73c8df7aa0d17d8b4a177bf2d2588be38a /global | |
| parent | 18216c529fe3c4ba2e793c948cd901de3a76eed6 (diff) | |
ports portssunet-ops-2015-04-17-v01
Diffstat (limited to 'global')
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp | 6 |
1 files changed, 3 insertions, 3 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 96e88cf..1644d8b 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp @@ -13,12 +13,12 @@ define sunet::etcd_node( "--ca-file /etc/ssl/certs/infra.crt", "--cert-file /etc/ssl/certs/${::fqdn}_infra.crt"] if $proxy { - $args = concat($common_args,["--proxy on","--listen-client-urls http://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"]) + $args = concat($common_args,["--proxy on","--listen-client-urls http://0.0.0.0:4001,http://0.0.0.0:2379"]) } else { $args = concat($common_args,["--initial-advertise-peer-urls http://${::ipaddress_eth1}:2380", "--advertise-client-urls http://${::ipaddress_eth1}:2379", "--listen-peer-urls http://0.0.0.0:2380", - "--listen-client-urls http://0.0.0.0:2379,http://${::ipaddress_docker0}:2379", + "--listen-client-urls http://0.0.0.0:4001,http://0.0.0.0:2379", "--peer-key-file /etc/ssl/private/${::fqdn}_infra.key", "--peer-ca-file /etc/ssl/certs/infra.crt", "--peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt"]) @@ -28,7 +28,7 @@ define sunet::etcd_node( imagetag => $etcd_version, volumes => ["/data/${name}:/var/lib/etcd","/etc/ssl:/etc/ssl"], command => join($args," "), - ports => ["${::ipaddress_eth1}:2380:2380","${::ipaddress_eth1}:2379:2379"] + ports => ["${::ipaddress_eth1}:2380:2380","${::ipaddress_eth1}:2379:2379","${::ipaddress_docker0}:4001:2379"] } if !$proxy { ufw::allow { "allow-etcd-peer": |