Fix backup expiry script to match prefixes correctly

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 87b9ca26c7a637d95260421e9a0fc43cae6276c0..d7b698e59682accfbf627faec9d5a105524796cb 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,27 +4,18 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

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

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.105"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"

       }
     }
       }
     }

-  },
-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-internal]"
+  "role[netalerts]"

 )
 )