Imagery - apply roles

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 366eff416eb388924028ba88c14cf433a9d86ef7..0e0362978dc897af691c26f2ead899c0b5498477 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: imagery
-# Recipe:: au-agri
+# Recipe:: au_agri
 #
 # Copyright 2016, OpenStreetMap Foundation
 #

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 5132f1b44e0360a54600c54e9b95e8b0522e2d84..ce46491cb82dc4b1c617695a52458f3ad856f252 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: imagery
-# Recipe:: gb-hampshire-aerial
+# Recipe:: gb_hampshire_aerial
 #
 # Copyright 2016, OpenStreetMap Foundation
 #

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index a6fe8a878740eb3571be7afbde1da6b9eb512074..7c7e9ad72feaf4fdfed811ddfe028d686ec0cf53 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: imagery
-# Recipe:: gb-ossv
+# Recipe:: gb_os_sv
 #
 # Copyright 2016, OpenStreetMap Foundation
 #

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 8fcb4ecbd740f9122c1278d1e2fe9f4ced415380..86ef3c60cb2c6f8f89d62508154503c57b450aea 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: imagery
-# Recipe:: gb-surrey-aerial
+# Recipe:: gb_surrey_aerial
 #
 # Copyright 2016, OpenStreetMap Foundation
 #

diff --git a/roles/imagery.rb b/roles/imagery.rb
index f8afc666b6b96cd8159c78dbb09afd6c9b7f1490..51664ee191b091e93abee437a35fcdd433a90f23 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -29,5 +29,8 @@ default_attributes(
 )
 
 run_list(
-  "recipe[imagery]"
+  "recipe[imagery::au_agri]",
+  "recipe[imagery::gb_hampshire_aerial]",
+  "recipe[imagery::gb_os_sv]",
+  "recipe[imagery::gb_surrey_aerial]"
 )