Don't escape wildcard prefixes during backup expiry

[chef.git] / roles / rhaegal.rb

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 6997afa571737f608503e37b1b1faed5c82dd9c5..72d8ae57caa24b12f583c701e805ed08e3a396b0 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,71 +7,27 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
       :mmiler => { :status => :administrator }
     }
   },

-  :devices => {
-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_860_PRO_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    }
-  },

   :location => "Zagreb, Croatia",
   :networking => {
     :interfaces => {
   :location => "Zagreb, Croatia",
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "enp1s0f0",
+      :external => {
+        :interface => "eno1",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "10.5.0.77",
-        :prefix => "16",
-        :gateway => "10.5.0.1"
-      }
-    },
-    :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"
-    },
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
+        :inet => {
+          :address => "193.198.233.218",
+          :prefix => "29",
+          :gateway => "193.198.233.217"
+        },
+        :inet6 => {
+          :address => "2001:b68:40ff:3::2",
+          :prefix => "64",
+          :gateway => "2001:b68:40ff:3::1"
+        }

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

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

 )
 )