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

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 14b4ee518588ff058120d77e67f5587851143c0f..b00e22c5f5f3cc84a925cf0480ead1ff66a10521 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,29 +4,19 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },
-      :external_ipv4 => {
-        :interface => "eth1",
+      :external => {
+        :interface => "eno1",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.10"
+        :inet => {
+          :address => "184.107.48.228",
+          :prefix => "27",
+          :gateway => "184.107.48.225"
+        }
       }
     }
-  },
-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
   }
 )
 
 run_list(
-  "role[ucl-slough]",
-  "role[hp-g5]",
-  "role[roundup]"
+  "role[netalerts]"
 )