Merge "Split ceph operations and openstack restart to different methods"