undercloud-setup fixups