Upgrade remaining UCL machines to chef 13

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 6595ba2ee30e4380e5d3ad79d6dab582ff06a726..f9ec9ebc782a42d42af0eab6403fc8ffdf4db4ea 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,12 +2,6 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

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

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"


@@ -30,13 +24,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

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

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

-        :address => "128.40.45.205"
+        :address => "193.60.236.19"

       },
       :internal_ipv4 => {
       },
       :internal_ipv4 => {

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

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"


@@ -84,7 +78,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

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

   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",


@@ -92,6 +86,7 @@ run_list(
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",

+  "role[donate]",

   "recipe[dhcpd]",
   "recipe[openvpn]"
 )
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )