Remove last traces of legacy certificate support

[chef.git] / roles / sarel.rb

diff --git a/roles/sarel.rb b/roles/sarel.rb
index e8f22400da2aec92cc91fab2b4bfbaf5d8bf731f..aab567bd87a9b810109843eba9c7c2cc5a7f52f1 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -5,13 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {

-        :interface => "eth1.2800",
+        :interface => "eth0.2800",

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


@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]",
   "role[yournavigation]"
 )
   "role[hp-g5]",
   "role[yournavigation]"
 )