Added journal and journalsize parameters.
Tweaked erb template
Indentation fix
Added params to spec test.
Merge branch 'extend-osd-conf' of https://github.com/danzilio/puppet-ceph into extend-osd-conf
Merge branch 'extend-osd-conf' of git://github.com/danzilio/puppet-ceph into danzilio-extend-osd-conf

Conflicts:
	manifests/conf/osd.pp
	templates/ceph.conf-osd.erb
Merge branch 'danzilio-extend-osd-conf'