summaryrefslogtreecommitdiffstats
path: root/config/pdf
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-30 22:32:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-30 22:32:46 +0000
commit48b9aa5af10deebcda256d74681b1c56f516adc9 (patch)
treea59d7d12d0699138cacdf2f31cfd1f2ed80fa726 /config/pdf
parentce5cd10b7ce6714124dcdbfc76365ae0854f9146 (diff)
parent42415daa0a9ca2d2d52620f46b9edb3f8f7b1da5 (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 'config/pdf')
-rw-r--r--config/pdf/idf-pod1.schema.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index 78e2204..ad680da 100644
--- a/config/pdf/idf-pod1.schema.yaml
+++ b/config/pdf/idf-pod1.schema.yaml
@@ -81,6 +81,11 @@ properties:
version:
type: 'number'
enum: [0.1]
+ installer:
+ type: 'array'
+ items:
+ type: 'string'
+ enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid']
net_config:
type: 'object'
fuel:
@@ -106,6 +111,9 @@ properties:
$ref: '#/definitions/daisy/v0.1'
compass:
$ref: '#/definitions/compass/v0.1'
+ fuel:
+ required: ['net_config']
+ daisy:
required: ['net_config']
# Do not allow any properties not defined here. This lets us catch typos.