Commit 993c6dcd authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'azure-alternative-images' into 'master' 

Azure alternative images

See merge request !153
parents 2d41926d 198c37b7

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

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

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.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

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    id: mgmtVM
@@ -83,6 +91,9 @@ vnfd: 
          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage

charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ 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

  vdu:

  - cloud-init-file: cloud-config.txt

    id: mgmtVM
@@ -83,6 +87,8 @@ vnfd: 
          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-azure

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage

charm-packages/native_charm_vnf/native_charm_vnfd.yaml

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ 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

  vdu:

  - cloud-init-file: cloud-config.txt

    id: mgmtVM
@@ -73,6 +77,8 @@ vnfd: 
          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-azure

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage

charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 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

  vdu:

  - cloud-init-file: cloud-config.txt

    id: mgmtVM
@@ -81,6 +85,8 @@ vnfd: 
          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-azure

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage

charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml

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

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.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

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    id: mgmtVM
@@ -80,6 +88,9 @@ vnfd: 
          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage