From: Tom Hughes Date: Fri, 8 Jan 2016 21:11:31 +0000 (+0000) Subject: Add role for cmok X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/dfa47bdc2772ef515f75ddb95b5b96d582d1dc6b Add role for cmok --- diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb index 98b26c2b9..cd207d802 100644 --- a/cookbooks/networking/templates/default/shorewall-zones.erb +++ b/cookbooks/networking/templates/default/shorewall-zones.erb @@ -27,3 +27,4 @@ jn:osm <%= @type %> es:osm <%= @type %> sz:osm <%= @type %> ex:osm <%= @type %> +dh:osm <%= @type %> diff --git a/roles/by.rb b/roles/by.rb new file mode 100644 index 000000000..60a54bcaa --- /dev/null +++ b/roles/by.rb @@ -0,0 +1,10 @@ +name "by" +description "Role applied to all servers located in Belarus" + +override_attributes( + :country => "by" +) + +run_list( + "role[base]" +) diff --git a/roles/cmok.rb b/roles/cmok.rb new file mode 100644 index 000000000..1cbe31d57 --- /dev/null +++ b/roles/cmok.rb @@ -0,0 +1,45 @@ +name "cmok" +description "Master role applied to cmok" + +default_attributes( + :networking => { + :interfaces => { + :external_ipv4 => { + :interface => "enp5s0", + :role => :external, + :family => :inet, + :address => "31.130.201.40", + :prefix => "27", + :gateway => "31.130.201.33" + }, + :external_ipv6 => { + :interface => "enp5s0", + :role => :external, + :family => :inet6, + :address => "2001:67c:2268:1005:21e:8cff:fe8c:8d3b", + :prefix => "64", + :gateway => "fe80::204:96ff:fe6d:4d39" + } + } + }, + :squid => { + :cache_mem => "4096 MB", + :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80" + }, + :tilecache => { + :tile_parent => "london.render.openstreetmap.org", + :tile_siblings => [ + "trogdor.openstreetmap.org", + "katie.openstreetmap.org", + "konqi.openstreetmap.org", + "ridgeback.openstreetmap.org", + "fume.openstreetmap.org", + "gorynych.openstreetmap.org" + ] + } +) + +run_list( + "role[datahata]", + "role[tilecache]" +) diff --git a/roles/datahata.rb b/roles/datahata.rb new file mode 100644 index 000000000..2df6c3c14 --- /dev/null +++ b/roles/datahata.rb @@ -0,0 +1,25 @@ +name "datahata" +description "Role applied to all servers at DataHata" + +default_attributes( + :networking => { + :nameservers => [ + "31.130.200.2" + ], + :roles => { + :external => { + :zone => "dn" + } + } + } +) + +override_attributes( + :ntp => { + :servers => ["0.by.pool.ntp.org", "1.by.pool.ntp.org", "europe.pool.ntp.org"] + } +) + +run_list( + "role[by]" +)