Cleanup ceph cookbook, replace with upstream ceph cookbook

The stackforge ceph cookbook was replaced by upstream ceph cookbook,
so remove the roles defined in stackforge ceph cookbook and replace
with upstream ceph cookbook in Berksfile.

Change-Id: I2d12cb6c2c480a37ee1cfeaf5b76f068b6781160
Partial-Bug: #1409943

Berksfile

@@ -1,6 +1,6 @@
 source "https://supermarket.getchef.com"
 
-cookbook 'apache2', '1.9.6'
+cookbook 'apache2', '3.0.0'
 cookbook 'apt', '2.3.8'
 cookbook 'aws', '2.1.1'
 cookbook 'build-essential', '1.4.2'
@@ -18,8 +18,8 @@ cookbook 'yum', '3.1.4'
 cookbook 'selinux', '0.7.2'
 cookbook 'yum-epel', '0.3.4'
 cookbook 'statsd', github: 'att-cloud/cookbook-statsd'
+cookbook 'ceph', github: 'ceph/ceph-cookbook'
 
-cookbook 'ceph', github: 'stackforge/cookbook-ceph'
 cookbook 'openstack-block-storage', github: 'stackforge/cookbook-openstack-block-storage'
 cookbook 'openstack-common', github: 'stackforge/cookbook-openstack-common'
 cookbook 'openstack-compute', github: 'stackforge/cookbook-openstack-compute'

CHANGELOG.md

@@ -7,6 +7,7 @@ This file is used to list changes made in each version of openstack-chef-repo
 * Bump Chef gem to 11.16
 * update berkshelf from 2.0.18 to 3.1.5
 * Fix object storage recipe names
+* Cleanup ceph cookbook, replace with upstream ceph cookbook
 
 ## 9.1.0
 * Bump berkshelf to 2.0.18

infrastructure.yml

@@ -5,11 +5,6 @@ cookbooks:
 
 roles:
 - allinone-compute:
-- ceph-mds:
-- ceph-mon:
-- ceph-osd:
-- ceph-radosgw:
-- ceph-tgt:
 - os-compute-single-controller:
 - os-base:
 - os-ops-caching:

roles/ceph-mds.json

@@ -1,16 +0,0 @@
-{
-  "name": "ceph-mds",
-  "description": "Ceph Metadata Server",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::mds]"
-  ],
-  "env_run_lists": {
-  }
-}

roles/ceph-mon.json

@@ -1,16 +0,0 @@
-{
-  "name": "ceph-mon",
-  "description": "Ceph Monitor",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::mon]"
-  ],
-  "env_run_lists": {
-  }
-}

roles/ceph-osd.json

@@ -1,16 +0,0 @@
-{
-  "name": "ceph-osd",
-  "description": "Ceph Object Storage Device",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::osd]"
-  ],
-  "env_run_lists": {
-  }
-}

roles/ceph-radosgw.json

@@ -1,16 +0,0 @@
-{
-  "name": "ceph-radosgw",
-  "description": "Ceph RADOS Gateway",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::radosgw]"
-  ],
-  "env_run_lists": {
-  }
-}

roles/ceph-tgt.json

@@ -1,16 +0,0 @@
-{
-  "name": "ceph-tgt",
-  "description": "Ceph iSCSI Target",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "recipe[ceph::repo]",
-    "recipe[ceph::tgt]"
-  ],
-  "env_run_lists": {
-  }
-}