From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Mon, 13 Nov 2017 16:59:13 +0000 (+0100)
Subject: return back placement groups to ping-pong descriptors
X-Git-Tag: v3.0.2^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=3e10650bec6aec454ed683cfafc73a30ae937b01;p=osm%2Fdevops.git

return back placement groups to ping-pong descriptors

Change-Id: Icc5df66b81a315f7189384de3e52155af96d1306
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index bfea2106..37b38440 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -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'
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index 536198b7..e69bdb10 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -38,12 +38,12 @@ vnfd:vnfd-catalog:
                 port: '18889'
             port: '18889'
             cp: pong_vnfd/cp0
-        # placement-groups:
-        # -   member-vdus:
-        #     -   member-vdu-ref: iovdu_0
-        #     name: Weywot
-        #     requirement: Place this VM on the Kuiper belt object Weywot
-        #     strategy: COLOCATION
+        placement-groups:
+        -   member-vdus:
+            -   member-vdu-ref: iovdu_0
+            name: Weywot
+            requirement: Place this VM on the Kuiper belt object Weywot
+            strategy: COLOCATION
         vdu:
         -   cloud-init-file: pong_cloud_init.cfg
             count: '1'