From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Jun 2014 12:21:23 +0000 (+0100)
Subject: Get rid of the not really used ucl-external role
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/804dd139d1914cbd7245392e1a85d993421ac9a6

Get rid of the not really used ucl-external role
---

diff --git a/roles/errol.rb b/roles/errol.rb
index efb7b93b4..6e49cea9f 100644
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -60,6 +60,6 @@ default_attributes(
 );
 
 run_list(
-  "role[ucl-external]",
+  "role[ucl-internal]",
   "role[dev]"
 )
diff --git a/roles/ucl-external.rb b/roles/ucl-external.rb
deleted file mode 100644
index d6ac52d5a..000000000
--- a/roles/ucl-external.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-name "ucl-external"
-description "Role applied to all servers at UCL which are only on the external LAN"
-
-default_attributes(
-  :networking => {
-    :nameservers => [ "128.40.168.102", "8.8.8.8", "8.8.4.4" ]
-  }
-)
-
-run_list(
-  "role[ucl]"
-)