From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 30 Jan 2018 22:32:46 +0000 (+0000)
Subject: Merge changes from topics 'fuel-netmap', 'fix-check-jinja'
X-Git-Tag: 6.0.0~4
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=48b9aa5af10deebcda256d74681b1c56f516adc9;p=pharos.git

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
---

48b9aa5af10deebcda256d74681b1c56f516adc9