diff options
| -rw-r--r-- | fabfile/__init__.py | 3 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 16 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp | 16 |
3 files changed, 20 insertions, 15 deletions
diff --git a/fabfile/__init__.py b/fabfile/__init__.py index 8db5748..0a79308 100644 --- a/fabfile/__init__.py +++ b/fabfile/__init__.py @@ -33,3 +33,6 @@ def newvm(fqdn,ip,domain): def cp(local,remote): put(local,remote) + +def synci(): + get("/etc/network/interfaces",local_path="%(host)s/global/overlay/etc/interfaces") diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index fa46e1d..f76d5dd 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -821,20 +821,6 @@ class fail2ban { } } -define etcd_node($disco_url=undef) { - file { ["/data","/data/${name}","/data/${name}/${::hostname}"]: ensure => 'directory' } - sunet::docker_run { "etcd_${name}": - image => 'quay.io/coreos/etcd', - version => 'v2.0.8', - extra_parameters => ["-initial-advertise-peer-urls http://${::ipaddress_eth1}:2380", - "-listen-peer-urls http://${::ipaddress_eth1}:2380", - "-discovery ${disco_url}", - "-name ${::hostname}", - "-data-dir /data/${name}/${::hostname}"], - ports => ["2380:2380"] - } -} - class quantis { apt::ppa {'ppa:ndn/quantispci': } package {'quantispci-dkms': } @@ -854,7 +840,7 @@ class webappserver { } class webbackend { - etcd_node {'etcd': + sunet::etcd_node {'etcd': disco_url => 'https://discovery.etcd.io/5344f39debed977d90dd72e3a7267bf8' } 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 new file mode 100644 index 0000000..68df7d2 --- /dev/null +++ b/global/overlay/etc/puppet/modules/sunet/manifests/etcd_node.pp @@ -0,0 +1,16 @@ +define etcd_node( + $disco_url = undef, + $etcd_version = 'v2.0.8' +) { + file { ["/data","/data/${name}","/data/${name}/${::hostname}"]: ensure => 'directory' } + sunet::docker_run { "etcd_${name}": + image => 'quay.io/coreos/etcd', + version => $etcd_version, + extra_parameters => ["-initial-advertise-peer-urls http://${::ipaddress_eth1}:2380", + "-listen-peer-urls http://${::ipaddress_eth1}:2380", + "-discovery ${disco_url}", + "-name ${::hostname}", + "-data-dir /data/${name}/${::hostname}"], + ports => ["2380:2380"] + } +} |