X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fa63c845987967418edaff22b75958916b19f19a..b005795324502747e627568112c0e1cb22a89a1f:/roles/angor.rb?ds=inline

diff --git a/roles/angor.rb b/roles/angor.rb
index 7dcef6843..50a090194 100644
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -4,21 +4,30 @@ 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"
+        }
+      }
+    }
+  },
+  :accounts => {
+    :users => {
+      :htonl => { :status => :user },
+      :gmoncrieff => { :status => :user },
+      :zander => { :status => :user },
+      :"za-imagery" => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
       }
     }
   }