Merge "Add more variables to ansible" into feature/zuulv3