diff options
| author | Johan Lundberg <lundberg@nordu.net> | 2015-04-14 14:15:50 +0200 |
|---|---|---|
| committer | Johan Lundberg <lundberg@nordu.net> | 2015-04-14 14:15:50 +0200 |
| commit | f515e53ae6d84ff84b43616219b75e4958acfef5 (patch) | |
| tree | 81a5b9243656f6d7d5bfad19eb06fcff9b3e6d0d /global/overlay/etc/puppet | |
| parent | 262f508caca47d0c1a2a53ec7e3bf944feb6b0c5 (diff) | |
| parent | 9610479421abbef0a3db47d5be39287d64f2814d (diff) | |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-14-v27
Diffstat (limited to 'global/overlay/etc/puppet')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0f97a33..9c2edd5 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -860,8 +860,8 @@ class webappserver { } class webbackend { - sunet::etcd_node {'etcd': - disco_url => 'https://discovery.etcd.io/820b592ab0cde8313d390e5715e4d451' + sunet::etcd_node {'sunetweb': + disco_url => 'https://discovery.etcd.io/53d3ba1275a50941eb30b3f11debb961' } class { 'webcommon': } } 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 22b26a7..a01d60b 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp @@ -7,8 +7,8 @@ define sunet::etcd_node( sunet::docker_run { "etcd_${name}": image => 'quay.io/coreos/etcd', imagetag => $etcd_version, - volumes => ["/data/${name}/${::hostname}:/data","/etc/ssl:/etc/ssl"], - command => "--initial-advertise-peer-urls http://0.0.0.0:2380 --listen-peer-urls http://0.0.0.0:2380 --discovery ${disco_url} --data-dir /data --name ${::hostname} --key-file /etc/ssl/private/${::fqdn}_infra.key --peer-key-file /etc/ssl/private/${::fqdn}_infra.key --ca-file /etc/ssl/certs/infra.crt --peer-ca-file /etc/ssl/certs/infra.crt --cert-file /etc/ssl/certs/${::fqdn}_infra.crt --peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt", + volumes => ["/data/${name}:/var/lib/etcd","/etc/ssl:/etc/ssl"], + command => "--initial-advertise-peer-urls http://0.0.0.0:2380 --listen-peer-urls http://0.0.0.0:2380 --discovery ${disco_url} --name ${::hostname} --key-file /etc/ssl/private/${::fqdn}_infra.key --peer-key-file /etc/ssl/private/${::fqdn}_infra.key --ca-file /etc/ssl/certs/infra.crt --peer-ca-file /etc/ssl/certs/infra.crt --cert-file /etc/ssl/certs/${::fqdn}_infra.crt --peer-cert-file /etc/ssl/certs/${::fqdn}_infra.crt", ports => ["${::ipaddress_eth1}:2380:2380"] } } |