diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-30 22:32:46 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-01-30 22:32:46 +0000 |
commit | 48b9aa5af10deebcda256d74681b1c56f516adc9 (patch) | |
tree | a59d7d12d0699138cacdf2f31cfd1f2ed80fa726 /labs/zte | |
parent | ce5cd10b7ce6714124dcdbfc76365ae0854f9146 (diff) | |
parent | 42415daa0a9ca2d2d52620f46b9edb3f8f7b1da5 (diff) |
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
Diffstat (limited to 'labs/zte')
-rw-r--r-- | labs/zte/idf-pod2.yaml | 2 | ||||
-rw-r--r-- | labs/zte/idf-pod3.yaml | 2 | ||||
-rw-r--r-- | labs/zte/idf-pod9.yaml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml index dbe14b9e..960151d0 100644 --- a/labs/zte/idf-pod2.yaml +++ b/labs/zte/idf-pod2.yaml @@ -10,6 +10,8 @@ idf: version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + installer: ['apex', 'compass4nfv', 'daisy', 'joid'] net_config: oob: interface: 0 diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml index e5e19f4c..702e2565 100644 --- a/labs/zte/idf-pod3.yaml +++ b/labs/zte/idf-pod3.yaml @@ -10,6 +10,8 @@ idf: version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + installer: ['apex', 'compass4nfv', 'daisy', 'joid'] net_config: oob: interface: 0 diff --git a/labs/zte/idf-pod9.yaml b/labs/zte/idf-pod9.yaml index 61a225dc..1cdd5d88 100644 --- a/labs/zte/idf-pod9.yaml +++ b/labs/zte/idf-pod9.yaml @@ -10,6 +10,8 @@ idf: version: 0.1 + # NOTE: For now, only Daisy supports 3-node clusters + installer: ['daisy'] net_config: # NOTE: Network names are likely to change after the PDF spec is updated oob: |