Track backport branches of osm2pgsql git on irc

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 94b2ea6839eff77b1714f41ad9f196029233682c..379e35f20f383070490fdfc1fc7dd19723cbe17c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,9 +2,6 @@ name "poldi"
 description "Master role applied to poldi"
 
 default_attributes(
 description "Master role applied to poldi"
 
 default_attributes(

-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },

   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",
   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",


@@ -43,50 +40,25 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
         :interface => "eth0",
         :role => :internal,
         :family => :inet,

-        :address => "10.0.0.16"
+        :address => "146.179.159.164"

       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.203"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "24GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :address => "193.63.75.101"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:630:12:500:2e0:81ff:fec5:333e"

       }
     }
       }
     }

-  },
-  :nominatim => {
-    :enabled => false,
-    :database => {
-        :cluster => "9.1/main",
-        :dbname => "nominatim",
-        :postgis => "2.0"
-    },
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "60"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "role[tyan-s7010]",
-  "role[nominatim]"
+  "role[ic]",
+  "role[tyan-s7010]"

 )
 )