Merge "FlowNAC updated descriptors (plugtest): Fixed Makefile"

[osm/devops.git] / src / vnfd / ubuntu_xenial_vnf / ubuntu_xenial_vnfd.yaml

diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
index c15ef1b..ee6a3ac 100644 (file)
--- a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
+++ b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
@@ -1,8 +1,8 @@
 vnfd:vnfd-catalog:
     vnfd:
     -   id: ubuntu_xenial_vnfd
-        name: ubuntu_xenial_vnfd
-        short-name: ubuntu_xenial_vnfd
+        name: ubuntu_xenial_vnf
+        short-name: ubuntu_xenial_vnf
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'
@@ -30,6 +30,9 @@ vnfd:vnfd-catalog:
             # Image including the full path
             image: '/mnt/powervault/virtualization/vnfs/demos/ubuntu/ubuntu-16.04.img'
 
+            # User-data injection
+            cloud-init-file: cloud_init.cfg
+
             external-interface:
             # Specify the external interfaces
             # There can be multiple interfaces defined
@@ -39,15 +42,7 @@ vnfd:vnfd-catalog:
                     bandwidth: '0'
                     vpci: 0000:00:0a.0
                 vnfd-connection-point-ref: eth0
-            -   name: eth1
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: '0'
-                    vpci: 0000:00:0b.0
-                vnfd-connection-point-ref: eth1
 
         connection-point:
             -   name: eth0
                 type: VPORT
-            -   name: eth1
-                type: VPORT