Merge "Remove cinder-volume from ctl-nodes ovs"