Merge changes from topics 'fuel-netmap', 'fix-check-jinja'
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 30 Jan 2018 22:32:46 +0000 (22:32 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 30 Jan 2018 22:32:46 +0000 (22:32 +0000)
commit48b9aa5af10deebcda256d74681b1c56f516adc9
treea59d7d12d0699138cacdf2f31cfd1f2ed80fa726
parentce5cd10b7ce6714124dcdbfc76365ae0854f9146
parent42415daa0a9ca2d2d52620f46b9edb3f8f7b1da5
Merge changes from topics 'fuel-netmap', 'fix-check-jinja'

* changes:
  [fuel] Add net_map.j2 for net config abstraction
  [fuel] Explicitly blacklist incompatible labs
  [IDF] Add optional 'idf.installer' array
config/installers/fuel/pod_config.yml.j2