Enable crm-staging on dribble and add user kevin

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index ade67133a9331fd758a4e094db7ad6eb3e9b9c9a..2d03f873e03bbf1f175ecdadfe366181bc2f8c04 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -7,20 +7,18 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {

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

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

-        :family => :inet,
-        :address => "140.211.167.100",
+        :inet => {
+          :address => "140.211.167.100"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a764"
+        },

         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }

-      },
-      :external_ipv6 => {
-        :interface => "bond0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a764"

       }
     }
   },
       }
     }
   },


@@ -42,7 +40,7 @@ default_attributes(
     :logdir => "/ssd/nominatim/log",
     :fpm_pools => {
       "nominatim.openstreetmap.org" => {
     :logdir => "/ssd/nominatim/log",
     :fpm_pools => {
       "nominatim.openstreetmap.org" => {

-        :max_children => 100
+        :max_children => 80

       }
     }
   }
       }
     }
   }