Skip to content

Commit

Permalink
Split cookbook out from Chef App (chef-bcs)
Browse files Browse the repository at this point in the history
  • Loading branch information
hanscj1 committed Nov 16, 2015
1 parent 5ccc7eb commit 7960c42
Show file tree
Hide file tree
Showing 30 changed files with 158 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ suites:
- { device: "/dev/sdd" }
run_list:
- recipe[ceph-chef::all_in_one]
- recipe[ceph_test::cephfs]
- recipe[ceph_chef_test::cephfs]
2 changes: 1 addition & 1 deletion Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata
group :integration do
cookbook 'apt'
cookbook 'yum'
cookbook 'ceph_test', path: 'test/cookbooks/ceph_test'
cookbook 'ceph_chef_test', path: 'test/cookbooks/ceph_chef_test'
end
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
ceph-chef
=========

v1.0.0 (2015-11-17)
NOTE: You can find out how to use this cookbook and see how Bloomberg uses it at:
https://github.com/bloomberg/chef-bcs

v0.9.0 (2015-11-17)
-------------------

BETA: Documentation needs more clarity and substance. There are still true OS agnostic testing going on. One major
change coming is an update to the newer Chef style of moving provider/resource into classes in the libraries folder.
This will simplify the cookbook structure going forward.

- Support for Chef 12.5+
- Complete Ceph functionality
- Only supports Ceph Hammer and above
- Rados Gateway (RGW) only supports civetweb style (no Apache)
- RADOS Gateway (RGW) only supports civetweb style (no Apache)
2 changes: 1 addition & 1 deletion attributes/mds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

include_attribute 'ceph'
include_attribute 'ceph-chef'

default['ceph']['mds']['init_style'] = node['init_style']

Expand Down
4 changes: 2 additions & 2 deletions attributes/mon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

include_attribute 'ceph'
include_attribute 'ceph-chef'

# The ceph mon ips attribute gets built in a wrapper recipe or chef-repo style environment like ceph-chef
default['ceph']['mon']['ips'] = nil
Expand All @@ -23,7 +23,7 @@
# The default is everything on the same OS
default['ceph']['mon']['init_style'] = node['ceph']['init_style']

default['ceph']['mon']['secret_file'] = '/etc/chef/secrets/ceph_mon'
default['ceph']['mon']['secret_file'] = '/etc/chef/secrets/ceph_chef_mon'

# MUST be set in the wrapper cookbook or chef-repo like project
default['ceph']['mon']['role'] = 'search-ceph-mon'
Expand Down
2 changes: 1 addition & 1 deletion attributes/osd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
default['ceph']['osd']['dmcrypt'] = false # By default don't encrypt osds at rest
default['ceph']['osd']['fs_type'] = 'xfs' # xfs, ext4, btrfs

default['ceph']['osd']['secret_file'] = '/etc/chef/secrets/ceph_osd'
default['ceph']['osd']['secret_file'] = '/etc/chef/secrets/ceph_chef_osd'

# Defaults for osd pools that are replica pools. Max size is the number of replicas and min is the lowest.
default['ceph']['osd']['size']['max'] = 3
Expand Down
12 changes: 6 additions & 6 deletions attributes/radosgw.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# limitations under the License.
#

include_attribute 'ceph'
include_attribute 'ceph-chef'

default['ceph']['radosgw']['api_fqdn'] = 'localhost'
default['ceph']['radosgw']['admin_email'] = '[email protected]'
Expand All @@ -47,18 +47,18 @@
# Important: These values must be present or the creation of the admin user will fail!
default['ceph']['radosgw']['user']['admin']['uid'] = 'radosgw'
default['ceph']['radosgw']['user']['admin']['name'] = 'Admin'
default['ceph']['radosgw']['user']['admin']['access_key'] = ceph_secure_password_alphanum_upper(20)
default['ceph']['radosgw']['user']['admin']['secret'] = ceph_secure_password(40)
default['ceph']['radosgw']['user']['admin']['access_key'] = ceph_chef_secure_password_alphanum_upper(20)
default['ceph']['radosgw']['user']['admin']['secret'] = ceph_chef_secure_password(40)

# Test user: If you don't want one then set the next line to = ''
default['ceph']['radosgw']['user']['test']['uid'] = 'tester'
default['ceph']['radosgw']['user']['test']['name'] = 'Tester'
default['ceph']['radosgw']['user']['test']['access_key'] = ceph_secure_password_alphanum_upper(20)
default['ceph']['radosgw']['user']['test']['secret'] = ceph_secure_password(40)
default['ceph']['radosgw']['user']['test']['access_key'] = ceph_chef_secure_password_alphanum_upper(20)
default['ceph']['radosgw']['user']['test']['secret'] = ceph_chef_secure_password(40)
default['ceph']['radosgw']['user']['test']['max_buckets'] = 3
default['ceph']['radosgw']['user']['test']['caps'] = 'usage=read; user=read; bucket=read;'

default['ceph']['radosgw']['secret_file'] = '/etc/chef/secrets/ceph_rgw'
default['ceph']['radosgw']['secret_file'] = '/etc/chef/secrets/ceph_chef_rgw'

# MUST be set in the wrapper cookbook or chef-repo like project
default['ceph']['radosgw']['role'] = 'search-ceph-radosgw'
Expand Down
Loading

0 comments on commit 7960c42

Please sign in to comment.