Commit 0cc5a2e1 authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'gcp' into 'master' 

Added GCP alternative images in two descriptors

See merge request !179
parents 2cddae6a 7409c525

charm-packages/cmr_relation_vnf/cmr_relation_vnfd.yaml

+17 −0
Original line number Diff line number Diff line
@@ -150,6 +150,14 @@ vnfd: 
    - id: ubuntu18.04

      image: ubuntu18.04

      name: ubuntu18.04

    - id: ubuntu18.04-azure

      name: ubuntu18.04-azure

      image: Canonical:UbuntuServer:18.04-LTS:latest

      vim-type: azure

    - id: ubuntu18.04-gcp

      name: ubuntu18.04-gcp

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

      vim-type: gcp

  kdu:

    - name: native-kdu

      juju-bundle: bundle.yaml
@@ -165,6 +173,9 @@ vnfd: 
                type: PARAVIRT

      name: simple_requires

      sw-image-desc: ubuntu18.04

      alternative-sw-image-desc:

      - ubuntu18.04-azure

      - ubuntu18.04-gcp

      virtual-compute-desc: simple_requires-compute

      virtual-storage-desc:

        - simple_requires-storage
@@ -179,6 +190,9 @@ vnfd: 
                type: PARAVIRT

      name: simple_requires_kdu

      sw-image-desc: ubuntu18.04

      alternative-sw-image-desc:

      - ubuntu18.04-azure

      - ubuntu18.04-gcp

      virtual-compute-desc: simple_requires_kdu-compute

      virtual-storage-desc:

        - simple_requires_kdu-storage
@@ -193,6 +207,9 @@ vnfd: 
                type: PARAVIRT

      name: simple_provides

      sw-image-desc: ubuntu18.04

      alternative-sw-image-desc:

      - ubuntu18.04-azure

      - ubuntu18.04-gcp

      virtual-compute-desc: simple_provides-compute

      virtual-storage-desc:

        - simple_provides-storage

simple_2vm_vnf/simple_2vm_vnfd.yaml

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ vnfd: 
    name: ubuntu20.04-azure

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

    vim-type: azure

  - id: ubuntu20.04-gcp

    name: ubuntu20.04-gcp

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

    vim-type: gcp

  vdu:

  - id: mgmtVM

    int-cpd:
@@ -52,6 +56,7 @@ vnfd: 
    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu20.04-azure

    - ubuntu20.04-gcp

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage
@@ -68,6 +73,7 @@ vnfd: 
    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu20.04-azure

    - ubuntu20.04-gcp

    virtual-compute-desc: dataVM-compute

    virtual-storage-desc:

    - dataVM-storage