Replace openstreetmap-cgimap-bin with openstreetmap-cgimap

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index 6cd1fd19765e0255ee95ebbeb4ecee7aef2c0058..be08e517cae28fe6ae46de57228a6aa72d0394bc 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -4,21 +4,19 @@ description "Master role applied to angor"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eno1",
         :role => :external,
-        :family => :inet,
-        :address => "196.10.54.165",
-        :prefix => "29",
-        :gateway => "196.10.54.161"
-      },
-      :external_ipv6 => {
-        :interface => "eno1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:43f8:1f4:b00:b283:feff:fed8:dd45",
-        :prefix => "64",
-        :gateway => "2001:43f8:1f4:b00::1"
+        :inet => {
+          :address => "196.10.54.165",
+          :prefix => "29",
+          :gateway => "196.10.54.161"
+        },
+        :inet6 => {
+          :address => "2001:43f8:1f4:b00:b283:feff:fed8:dd45",
+          :prefix => "64",
+          :gateway => "2001:43f8:1f4:b00::1"
+        }
       }
     }
   },
@@ -27,7 +25,7 @@ default_attributes(
       :htonl => { :status => :user },
       :gmoncrieff => { :status => :user },
       :zander => { :status => :user },
-      :za-imagery => {
+      :"za-imagery" => {
           :status => :role,
           :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
@@ -36,6 +34,5 @@ default_attributes(
 )
 
 run_list(
-  "role[inxza]",
-  "role[ftp]"
+  "role[inxza]"
 )