Merge remote-tracking branch 'github/pull/578'

[chef.git] / roles / rhaegal.rb

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index fa2480be414353e221c2cb76a73bf9675d32aa8d..6aafb5d33f0c90d358e5f93140ac5e7ed3bd176f 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,9 +7,6 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
       :mmiler => { :status => :administrator }
     }
   },

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

   :location => "Zagreb, Croatia",
   :munin => {
     :plugins => {
   :location => "Zagreb, Croatia",
   :munin => {
     :plugins => {


@@ -32,7 +29,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "enp1s0f0",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :address => "10.5.0.77",
         :role => :external,
         :family => :inet,
         :address => "10.5.0.77",


@@ -40,48 +37,10 @@ default_attributes(
         :gateway => "10.5.0.1",
         :public_address => "161.53.248.77"
       }
         :gateway => "10.5.0.1",
         :public_address => "161.53.248.77"
       }

-    },
-    :nameservers => [
-      "10.5.0.7",
-      "8.8.8.8"
-    ]
-  },
-  :postgresql => {
-    :versions => ["10"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
-    },
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[carnet]",
-  "role[tile]"
+  "role[carnet]"

 )
 )