diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-04-16 23:59:51 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-04-16 23:59:51 +0200 |
| commit | 18216c529fe3c4ba2e793c948cd901de3a76eed6 (patch) | |
| tree | 176f4c5c280406259d64f0043aabd2c1d155adff | |
| parent | 465cfea95609aaf6ea4402c3ac41be3250a37ba7 (diff) | |
scoping hell part2sunet-ops-2015-04-16-v07
| -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 0a50db6..96e88cf 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp @@ -13,15 +13,15 @@ define sunet::etcd_node( "--ca-file /etc/ssl/certs/infra.crt", "--cert-file /etc/ssl/certs/${::fqdn}_infra.crt"] if $proxy { - $args = $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://${::ipaddress_docker0}:2379,http://127.0.0.1:4001,http://127.0.0.1:2379"]) } else { - $args = $common_args + ["--initial-advertise-peer-urls http://${::ipaddress_eth1}:2380", + $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", "--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"] + "--peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt"]) } sunet::docker_run { "etcd_${name}": image => 'quay.io/coreos/etcd', |