Use OS root certificiate bundle to avoid wordpress API via chef ruby

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 8094e63c0d8d880676fda2956deec0bb2bd75ed6..3667d73dfaea8a1fccbbe81ebda6e711218a8133 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,17 +2,14 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
 description "Master role applied to tabaluga"
 
 default_attributes(

-  :dhcpd => {
-    :first_address => "10.0.62.1",
-    :last_address => "10.0.62.254"
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.14",
+        :inet => {
+          :address => "10.0.48.14"
+        },

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",


@@ -20,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.14"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:E"
+        :inet => {
+          :address => "184.104.179.142"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::e"
+        }

       }
     }
   }
       }
     }
   }


@@ -39,6 +34,6 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",

-  "role[wiki]",
-  "recipe[dhcpd]"
+  "role[blog-staging]",
+  "role[taginfo]"

 )
 )