Merge changes from topic 'allow-deployment-overrides'
authorMarkos Chandras <mchandras@suse.de>
Tue, 20 Mar 2018 17:28:50 +0000 (17:28 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 20 Mar 2018 17:28:50 +0000 (17:28 +0000)
* changes:
  xci: infra: bifrost: Avoid installing Ansible twice
  Add initial support for multiple infra deployers


Trivial merge