Upgrade ridley and ouroboros to chef 12

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index eaaa8f8cb76a63fa5d44a2c80ec01eeb3749a663..efcdd4c7dae67bd72b183e9358a6babadb07ad12 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,7 +2,13 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

-  :dhcpd =>{
+  :apache => {
+    :ssl => {
+      :certificate => "osmfoundation",
+      :certificate_chain => "startcom"
+    }
+  },
+  :dhcpd => {

     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },


@@ -19,7 +25,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
         :category => "Ups",
         :values => {
           :load => {

-            :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ],
+            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],

             :label => "Load"
           }
         }
             :label => "Load"
           }
         }


@@ -39,7 +45,7 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"

-      },
+      }

     }
   },
   :openvpn => {
     }
   },
   :openvpn => {