Merge "Don't look for ansible_host unconditionally" into feature/zuulv3