From 4684cbece20caae934fd573e69e961cfe732139e Mon Sep 17 00:00:00 2001 From: limon <alimonj@indra.es> Date: Fri, 5 Jun 2020 10:29:51 +0200 Subject: [PATCH] Revert last changes over hackfest_multivdu package --- hackfest_multivdu_vnf/cloud_init/.gitkeep | 0 hackfest_multivdu_vnf/cloud_init/cloud-config.txt | 12 ------------ hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml | 6 ++---- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 hackfest_multivdu_vnf/cloud_init/.gitkeep delete mode 100644 hackfest_multivdu_vnf/cloud_init/cloud-config.txt diff --git a/hackfest_multivdu_vnf/cloud_init/.gitkeep b/hackfest_multivdu_vnf/cloud_init/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/hackfest_multivdu_vnf/cloud_init/cloud-config.txt b/hackfest_multivdu_vnf/cloud_init/cloud-config.txt deleted file mode 100644 index e22d345c..00000000 --- a/hackfest_multivdu_vnf/cloud_init/cloud-config.txt +++ /dev/null @@ -1,12 +0,0 @@ -#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/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index 37df7201..dc3563c3 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -21,7 +21,7 @@ vnfd-catalog: vdu: - id: mgmtVM name: mgmtVM - image: ubuntu16.04 + image: US1604 count: 1 vm-flavor: vcpu-count: 1 @@ -42,10 +42,9 @@ vnfd-catalog: internal-connection-point-ref: mgmtVM-internal internal-connection-point: - id: mgmtVM-internal - cloud-init-file: cloud-config.txt - id: dataVM name: dataVM - image: ubuntu16.04 + image: US1604 count: 1 vm-flavor: vcpu-count: 1 @@ -66,5 +65,4 @@ vnfd-catalog: external-connection-point-ref: vnf-data internal-connection-point: - id: dataVM-internal - cloud-init-file: cloud-config.txt -- GitLab