Skip to content
Snippets Groups Projects
Commit 9cebbc25 authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge from master


Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
parents 7ec884b7 78e9a7f5
No related branches found
No related tags found
1 merge request!11Hackfest9
......@@ -13,6 +13,7 @@ vnfd:vnfd-catalog:
cp: vnf-mgmt
internal-vld:
- id: internal
name: internal
type: ELAN
internal-connection-point:
- id-ref: mgmtVM-internal
......
......@@ -13,6 +13,7 @@ vnfd:vnfd-catalog:
cp: vnf-mgmt
internal-vld:
- id: internal
name: internal
type: ELAN
internal-connection-point:
- id-ref: mgmtVM-internal
......@@ -76,7 +77,7 @@ vnfd:vnfd-catalog:
type: PARAVIRT
internal-connection-point-ref: dataVM-internal
- name: xe0
position: '2'
position: 2
type: EXTERNAL
virtual-interface:
type: SR-IOV
......
......@@ -13,6 +13,7 @@ vnfd:vnfd-catalog:
cp: vnf-mgmt
internal-vld:
- id: internal
name: internal
type: ELAN
internal-connection-point:
- id-ref: mgmtVM-internal
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment