modify roles for ceph+openstack

Change-Id: I8eda7b02c91aad05dead38db1d9041d12a27de31
Merge "modify roles for ceph+openstack" into dev/experimental