Merge "Use generic vars file for ubuntu"

This commit is contained in:
Zuul 2018-07-31 16:38:32 +00:00 committed by Gerrit Code Review
commit 407764ccec