Resync with openstack-yaml-infra-ref-arch