planet: add notes S3 redirect

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index c9b7e00c4b8bf8e8277394f5da8787307985e888..4b8587fd9e294571528f34a183f9f024f969b71b 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -4,11 +4,12 @@ description "Master role applied to naga"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

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

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

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

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


@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },

-      :external_ipv4 => {
+      :external => {

         :interface => "bond0.101",
         :role => :external,
         :interface => "bond0.101",
         :role => :external,

-        :family => :inet,
-        :address => "184.104.226.104"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::8"
+        :inet => {
+          :address => "184.104.226.104"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8"
+        }

       }
     }
   }
       }
     }
   }


@@ -41,7 +40,11 @@ run_list(
   "role[blogs]",
   "role[munin]",
   "role[switch2osm]",
   "role[blogs]",
   "role[munin]",
   "role[switch2osm]",

+  "recipe[foundation::mastodon]",

   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",
   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",

-  "recipe[stateofthemap::container]"
+  "recipe[stateofthemap::container]",
+  "recipe[hot]",
+  "recipe[ideditor]",
+  "recipe[dmca]"

 )
 )