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

hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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

hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml

+2 −1
Original line number Diff line number Diff line
@@ -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

hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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