Merge "Switch scenario004-containers to use ceph-ansible" into stable/pike