Add test for tile cookbook

[chef.git] / roles / pyrene.rb

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 8b51e658c1762c00bfca56cf88f5dde85d956888..f320526a89256b21aaf95ab7bcb069111c7f6d68 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,9 +2,6 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
 description "Master role applied to pyrene"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :munin => {
     :plugins => {
       :hpasmcli2_temp => {
   :munin => {
     :plugins => {
       :hpasmcli2_temp => {


@@ -19,15 +16,13 @@ default_attributes(
         :interface => "eno1",
         :role => :external,
         :family => :inet,
         :interface => "eno1",
         :role => :external,
         :family => :inet,

-        :address => "140.211.15.29",
-        :prefix => "24",
-        :gateway => "140.211.15.1"
+        :address => "140.211.167.98"

       },
       :external_ipv6 => {
         :interface => "eno1",
         :role => :external,
         :family => :inet6,
       },
       :external_ipv6 => {
         :interface => "eno1",
         :role => :external,
         :family => :inet6,

-        :address => "2605:bc80:3010:700::8cd3:0f1d"
+        :address => "2605:bc80:3010:700::8cd3:a762"

       }
     }
   },
       }
     }
   },


@@ -55,7 +50,6 @@ default_attributes(
       :cluster => "10/main",
       :postgis => "2.4"
     },
       :cluster => "10/main",
       :postgis => "2.4"
     },

-    :node_file => "/store/database/nodes",

     :styles => {
       :default => {
         :tile_directories => [
     :styles => {
       :default => {
         :tile_directories => [