Resync with openstack-yaml-infra-3nodes