diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-04-16 23:58:29 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-04-16 23:58:29 +0200 |
| commit | 465cfea95609aaf6ea4402c3ac41be3250a37ba7 (patch) | |
| tree | 5671e0a44d5367d63d3fdd12195ba993f2ee4353 /global/overlay/etc/puppet | |
| parent | 9df927868a9c66f4ba568dc33ec925eed079baaa (diff) | |
scoping hell part1sunet-ops-2015-04-16-v06
Diffstat (limited to 'global/overlay/etc/puppet')
| -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 6b3898f..0a50db6 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp @@ -7,15 +7,15 @@ define sunet::etcd_node( include stdlib file { ["/data","/data/${name}","/data/${name}/${::hostname}"]: ensure => 'directory' } - $args = ["--discovery ${disco_url}", + $common_args = ["--discovery ${disco_url}", "--name ${::hostname}", "--key-file /etc/ssl/private/${::fqdn}_infra.key", "--ca-file /etc/ssl/certs/infra.crt", "--cert-file /etc/ssl/certs/${::fqdn}_infra.crt"] if $proxy { - $args += ["--proxy on","--listen-client-urls http://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"] + $args = $common_args + ["--proxy on","--listen-client-urls http://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"] } else { - $args += ["--initial-advertise-peer-urls http://${::ipaddress_eth1}:2380", + $args = $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", |