Move lockheed roles to naga

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index 36e89852c7d2d244e5cbc2adfe92e1a2b81c21ad..9b4ad335fdbb98b5a916317ea0223bedc7a839a6 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -34,9 +34,5 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
-  "role[subversion]",
-  "role[trac]",
-  "role[irc]",
-  "role[blogs]"
+  "role[equinix-ams]"

 )
 )

diff --git a/roles/naga.rb b/roles/naga.rb
index 01a0d080396bc11d902161122a11f3c20460ae87..f69f91d531950aab324e568dbe9f320bf3d2ff38 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -34,5 +34,9 @@ default_attributes(
 
 run_list(
   "role[equinix-dub]",
 
 run_list(
   "role[equinix-dub]",

-  "role[hp-g9]"
+  "role[hp-g9]",
+  "role[subversion]",
+  "role[trac]",
+  "role[irc]",
+  "role[blogs]"

 )
 )