From d85c0c761b1ec292ad6294061e3ecbbdb0ec9c5d Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Sun, 31 Jan 2016 17:55:22 +0000
Subject: [PATCH] Imagery - apply roles

---
 cookbooks/imagery/recipes/au_agri.rb             | 2 +-
 cookbooks/imagery/recipes/gb_hampshire_aerial.rb | 2 +-
 cookbooks/imagery/recipes/gb_os_sv.rb            | 2 +-
 cookbooks/imagery/recipes/gb_surrey_aerial.rb    | 2 +-
 roles/imagery.rb                                 | 5 ++++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 366eff416..0e0362978 100644
--- 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 5132f1b44..ce46491cb 100644
--- 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 a6fe8a878..7c7e9ad72 100644
--- 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 8fcb4ecbd..86ef3c60c 100644
--- 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 f8afc666b..51664ee19 100644
--- 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]"
 )
-- 
2.39.5