From: Grant Slater Date: Fri, 1 Jan 2016 09:22:36 +0000 (+0000) Subject: Add base imagery recipe X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/609545d8aac44ced474b3290c8143bae60d3402e Add base imagery recipe --- diff --git a/cookbooks/imagery/README.md b/cookbooks/imagery/README.md new file mode 100644 index 000000000..205739199 --- /dev/null +++ b/cookbooks/imagery/README.md @@ -0,0 +1,34 @@ +Cookbook +======== +TODO: Enter the cookbook description here. + +e.g. +This cookbook makes your favorite breakfast sandwich. + +Requirements +------------ +TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc. + +Attributes +---------- +TODO: List you cookbook attributes here. + +Usage +----- +TODO: Write usage instructions for each cookbook. + +Contributing +------------ +TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section. + +e.g. +1. Fork the repository on Github +2. Create a named feature branch (like `add_component_x`) +3. Write your change +4. Write tests for your change (if applicable) +5. Run the tests, ensuring they all pass +6. Submit a Pull Request using Github + +License and Authors +------------------- +Authors: TODO: List authors diff --git a/cookbooks/imagery/metadata.rb b/cookbooks/imagery/metadata.rb new file mode 100644 index 000000000..07dd39838 --- /dev/null +++ b/cookbooks/imagery/metadata.rb @@ -0,0 +1,9 @@ +name "imagery" +maintainer "OpenStreetMap Administrators" +maintainer_email "admins@openstreetmap.org" +license "Apache 2.0" +description "Installs and configures imagery" +long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) +version "1.0.0" +depends "nginx" +depends "git" diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb new file mode 100644 index 000000000..a060c17bc --- /dev/null +++ b/cookbooks/imagery/recipes/default.rb @@ -0,0 +1,36 @@ +# +# Cookbook Name:: imagery +# Recipe:: default +# +# Copyright 2016, OpenStreetMap Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include_recipe "nginx" +include_recipe "git" + +# Imagery gdal Requirements +package "gdal-bin" +package "python-gdal" + +# Imagery MapServer + Mapcache Requirements +package "cgi-mapserver" +package "mapcache-cgi" +package "mapcache-tools" + +# Imagery processing Requirements +package "imagemagick" + +# Imagery misc compression +package "xz-utils" diff --git a/roles/grisu.rb b/roles/grisu.rb index 749be40e2..af13c4baf 100644 --- a/roles/grisu.rb +++ b/roles/grisu.rb @@ -30,5 +30,6 @@ default_attributes( run_list( "role[ic]", - "role[hp-dl180-g6]" + "role[hp-dl180-g6]", + "role[imagery]" ) diff --git a/roles/imagery.rb b/roles/imagery.rb new file mode 100644 index 000000000..f8afc666b --- /dev/null +++ b/roles/imagery.rb @@ -0,0 +1,33 @@ +name "imagery" +description "Role applied to all imagery servers" + +default_attributes( + :accounts => { + :users => { + :htonl => { :status => :user }, + :imagery => { + :status => :role, + :members => [:grant, :tomh, :htonl] + } + } + }, + :sysctl => { + :sockets => { + :comment => "Increase size of connection queue", + :parameters => { + "net.core.somaxconn" => 10000 + } + }, + :kernel_scheduler_tune => { + :comment => "Tune kernel scheduler preempt", + :parameters => { + "kernel.sched_min_granularity_ns" => 10000000, + "kernel.sched_wakeup_granularity_ns" => 15000000 + } + } + } +) + +run_list( + "recipe[imagery]" +)