Fixed add osd issue
Fixed merge commits

Conflicts:
	ceph-operations/ceph-operations.py