From db4b5d5e646ca31199917ab3b3280f352fdee1b7 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Mon, 17 Nov 2014 13:08:54 -0600
Subject: [PATCH] Fix object storage recipe names

The names are missing the "-server' for some the recipes.

Change-Id: Ief474de42d606acb6eb77e8343a5ce38b59d2902
---
 CHANGELOG.md                            | 1 +
 roles/os-object-storage-account.json    | 2 +-
 roles/os-object-storage-container.json  | 2 +-
 roles/os-object-storage-management.json | 2 +-
 roles/os-object-storage-object.json     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7acf80b..169f9c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This file is used to list changes made in each version of openstack-chef-repo
 * Bump mysql and mysql-chef to required levels for Juno
 * Bump Chef gem to 11.16
 * update berkshelf from 2.0.18 to 3.1.5
+* Fix object storage recipe names
 
 ## 9.1.0
 * Bump berkshelf to 2.0.18
diff --git a/roles/os-object-storage-account.json b/roles/os-object-storage-account.json
index 6027507..e90ed40 100644
--- a/roles/os-object-storage-account.json
+++ b/roles/os-object-storage-account.json
@@ -9,7 +9,7 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-object-storage::account]"
+    "recipe[openstack-object-storage::account-server]"
   ],
   "env_run_lists": {
   }
diff --git a/roles/os-object-storage-container.json b/roles/os-object-storage-container.json
index 494d4cb..2f9bd8f 100644
--- a/roles/os-object-storage-container.json
+++ b/roles/os-object-storage-container.json
@@ -9,7 +9,7 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-object-storage::container]"
+    "recipe[openstack-object-storage::container-server]"
   ],
   "env_run_lists": {
   }
diff --git a/roles/os-object-storage-management.json b/roles/os-object-storage-management.json
index 27aa232..94f20b5 100644
--- a/roles/os-object-storage-management.json
+++ b/roles/os-object-storage-management.json
@@ -9,7 +9,7 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-object-storage::management]"
+    "recipe[openstack-object-storage::management-server]"
   ],
   "env_run_lists": {
   }
diff --git a/roles/os-object-storage-object.json b/roles/os-object-storage-object.json
index 47806e4..38cc91a 100644
--- a/roles/os-object-storage-object.json
+++ b/roles/os-object-storage-object.json
@@ -9,7 +9,7 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "recipe[openstack-object-storage::object]"
+    "recipe[openstack-object-storage::object-server]"
   ],
   "env_run_lists": {
   }