nominatim: switch stormfly back to php frontend

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index b346657e5c4dd1edd2aefe5fb9c331dde8c6dde4..1f92c87df3c0c3682c04efb39362117dab7242a4 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -8,11 +8,12 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.12",
+        :inet => {
+          :address => "10.0.64.12"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -20,17 +21,15 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 ens1f0 ens1f1]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.108"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::c"
+        :inet => {
+          :address => "184.104.226.108"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::c"
+        }
       }
     }
   }
@@ -39,5 +38,6 @@ default_attributes(
 run_list(
   "role[equinix-dub]",
   "role[hp-dl360e-g8]",
+  "role[community]",
   "recipe[dhcpd]"
 )