From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 8 May 2018 16:28:46 +0000 (+0200)
Subject: Fixing cloud-config file in hackfest_simplecharm_vnf
X-Git-Tag: v4.0.0~27
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d43781b23293616217f03a8a0b6d442c618a960a;hp=0ee30e1c287e82cfa181142ca40c8bd598419b43;p=osm%2Fdevops.git

Fixing cloud-config file in hackfest_simplecharm_vnf

Change-Id: I506813b5fb4878a3873ca4aab86d7112c907b5a4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml b/descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml
index a85b2cb8..aebed0ac 100644
--- a/descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml
+++ b/descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml
@@ -12,9 +12,9 @@ nsd:nsd-catalog:
         -   vnfd-id-ref: hackfest-simplecharm-vnf
             member-vnf-index: '2'
         vld:
-        -   id: mgmt
-            name: mgmt
-            short-name: mgmt
+        -   id: mgmtnet
+            name: mgmtnet
+            short-name: mgmtnet
             type: ELAN
             mgmt-network: 'true'
             vim-network-name: mgmt
@@ -36,3 +36,4 @@ nsd:nsd-catalog:
             -   vnfd-id-ref: hackfest-simplecharm-vnf
                 member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: vnf-data
+
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt
index 2140ee08..f6c1b9dc 100755
--- a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt
+++ b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt
@@ -1,4 +1,13 @@
-#cloud-config
-password: osm4u
-chpasswd: { expire: False }
-ssh_pwauth: True
+#cloud-config
+password: osm4u
+chpasswd: { expire: False }
+ssh_pwauth: True
+
+write_files:
+-   content: |
+        # My new helloworld file
+
+    owner: root:root
+    permissions: '0644'
+    path: /root/helloworld.txt
+
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml
index c75101d1..9c6f095c 100644
--- a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml
@@ -103,3 +103,4 @@ vnfd:vnfd-catalog:
                 -   name: filename
                     data-type: STRING
                     default-value: '/home/ubuntu/touched'
+