I have documented the template changes needed for FFU (either NFV or not):
https://review.openstack.org/#/c/549892/
This should be included in the downstream documentation as well
Assigning to Martin for monitoring.
Martin, we can't schedule this update until the QE verification work is complete, so I am not officially accepting it into our program yet.
I added a link to an upstream patch, explaining how to change the services mapped from puppet to docker. This will be needed when custom resource_registry mappings are used, and this needs to be documented properly.