Move us and za imagery to lockheed

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 95bfe9e39cf2d7f15bac7847dff4fb175633d694..209b351705958ce390199f4ed7c1c9f1f325cad7 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -82,7 +82,5 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]",
-  "recipe[imagery::za_ngi_aerial]",
-  "recipe[imagery::us_imagery]"
+  "recipe[dhcpd]"
 )

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index ff2494dca615b1bb300d779f78cd658ee76725d3..b03347148a8b8f99b6a7316aa24249ff01a89301 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -33,5 +33,7 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[hp-g9]"
+  "role[hp-g9]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"
 )