Merge pull request #1469 from ceph/refact_code

Docker: Refact code

diff --cc group_vars/osds.yml.sample
Simple merge

diff --cc infrastructure-playbooks/rolling_update.yml
Simple merge

diff --cc roles/ceph-osd/defaults/main.yml
Simple merge