Add init loop in prometheus sidecar container

[osm/devops.git] / descriptor-packages / vnfd / ping_vnf / src / ping_vnfd.yaml

diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index bfea210..d73baf6 100644 (file)
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -15,7 +15,7 @@
 #
 #
 
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
      -  id: rift_ping_vnf
         name: ping_vnf
@@ -26,9 +26,9 @@ vnfd:vnfd-catalog:
         description: This is an example RIFT.ware VNF
         connection-point:
         -   name: ping_vnfd/cp0
-            type: VPORT
+
         -   name: ping_vnfd/cp1
-            type: VPORT
+
         http-endpoint:
         -   path: api/v1/ping/stats
             port: '18888'
@@ -38,12 +38,12 @@ vnfd:vnfd-catalog:
                 port: '18888'
             port: '18888'
             cp: ping_vnfd/cp0
-        # placement-groups:
-        # -   member-vdus:
-        #     -   member-vdu-ref: iovdu_0
-        #     name: Eris
-        #     requirement: Place this VM on the Kuiper belt object Eris
-        #     strategy: COLOCATION
+        placement-groups:
+        -   member-vdus:
+            -   member-vdu-ref: iovdu_0
+            name: Eris
+            requirement: Place this VM on the Kuiper belt object Eris
+            strategy: COLOCATION
         vdu:
         -   cloud-init-file: ping_cloud_init.cfg
             count: '1'
@@ -52,13 +52,13 @@ vnfd:vnfd-catalog:
                 position: 0
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: ping_vnfd/cp0
             -   name: eth1
                 position: 1
                 type: EXTERNAL
                 virtual-interface:
-                    type: VIRTIO
+                    type: PARAVIRT
                 external-connection-point-ref: ping_vnfd/cp1
             id: iovdu_0
             image: Fedora-x86_64-20-20131211.1-sda-ping.qcow2