openstack.yaml replaced from upstream master branch