Commit c6faf389 authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'ubuntu20' into 'master' 

Update hackfest VNFs images to Ubuntu 20

See merge request !227
parents beed2bc6 78ca6680

hackfest_basic_vnf/hackfest_basic_vnfd.yaml

+16 −15
Original line number Diff line number Diff line
@@ -19,29 +19,29 @@ vnfd: 
  mgmt-cp: vnf-cp0-ext

  product-name: hackfest_basic-vnf

  sw-image-desc:

  - id: ubuntu18.04

    name: ubuntu18.04

    image: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.04-aws

  - id: ubuntu20.04

    image: ubuntu20.04

    name: ubuntu20.04

  - id: ubuntu20.04-aws

    name: ubuntu20.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu18.04-azure

    name: ubuntu18.04-azure

    image: Canonical:UbuntuServer:18.04-LTS:latest

  - id: ubuntu20.04-azure

    name: ubuntu20.04-azure

    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest

    vim-type: azure

  - id: ubuntu18.04-gcp

    name: ubuntu18.04-gcp

    image: ubuntu-os-cloud:image-family:ubuntu-1804-lts

  - id: ubuntu20.04-gcp

    name: ubuntu20.04-gcp

    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts

    vim-type: gcp

  vdu:

  - id: hackfest_basic-VM

    name: hackfest_basic-VM

    sw-image-desc: ubuntu18.04

    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    - ubuntu18.04-gcp

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    - ubuntu20.04-gcp

    virtual-compute-desc: hackfest_basic-VM-compute

    virtual-storage-desc:

    - hackfest_basic-VM-storage
@@ -61,3 +61,4 @@ vnfd: 
  virtual-storage-desc:

  - id: hackfest_basic-VM-storage

    size-of-storage: 10

hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml

+19 −19
Original line number Diff line number Diff line
@@ -30,20 +30,20 @@ vnfd: 
  mgmt-cp: vnf-mgmt-ext

  product-name: hackfest_cloudinit-vnf

  sw-image-desc:

  - id: ubuntu18.04

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.04-aws

  - id: ubuntu20.04

    image: ubuntu20.04

    name: ubuntu20.04

  - id: ubuntu20.04-aws

    name: ubuntu20.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu18.04-azure

    name: ubuntu18.04-azure

    image: Canonical:UbuntuServer:18.04-LTS:latest

  - id: ubuntu20.04-azure

    name: ubuntu20.04-azure

    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest

    vim-type: azure

  - id: ubuntu18.04-gcp

    name: ubuntu18.04-gcp

    image: ubuntu-os-cloud:image-family:ubuntu-1804-lts

  - id: ubuntu20.04-gcp

    name: ubuntu20.04-gcp

    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts

    vim-type: gcp

  vdu:

  - cloud-init-file: cloud-config.txt
@@ -63,11 +63,11 @@ vnfd: 
        virtual-interface:

          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    - ubuntu18.04-gcp

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    - ubuntu20.04-gcp

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage
@@ -87,11 +87,11 @@ vnfd: 
        virtual-interface:

          type: PARAVIRT

    name: dataVM

    sw-image-desc: ubuntu18.04

    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    - ubuntu18.04-gcp

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    - ubuntu20.04-gcp

    virtual-compute-desc: dataVM-compute

    virtual-storage-desc:

    - dataVM-storage