diff options
author | 2018-01-30 22:32:46 +0000 | |
---|---|---|
committer | 2018-01-30 22:32:46 +0000 | |
commit | 48b9aa5af10deebcda256d74681b1c56f516adc9 (patch) | |
tree | a59d7d12d0699138cacdf2f31cfd1f2ed80fa726 /labs/nokia | |
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/nokia')
-rw-r--r-- | labs/nokia/idf-pod1.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/labs/nokia/idf-pod1.yaml b/labs/nokia/idf-pod1.yaml new file mode 100644 index 00000000..83aba95b --- /dev/null +++ b/labs/nokia/idf-pod1.yaml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 Nokia, Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +idf: + version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + installer: ['apex', 'compass4nfv', 'daisy', 'joid'] |