Google Cloud alternative images

489ccbad · Ubuntu · 467f2307 · 489ccbad · 489ccbad · 489ccbad
Commit 489ccbad authored Nov 03, 2021 by Ubuntu
20 changed files
--- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml
+++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml
@@ -73,6 +73,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -94,6 +98,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml
+++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml
@@ -69,6 +69,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -89,6 +93,7 @@ vnfd:
    sw-image-desc: ubuntu18.04
    alternative-sw-image-desc:
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml
+++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml
@@ -59,6 +59,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -79,6 +83,7 @@ vnfd:
    sw-image-desc: ubuntu18.04
    alternative-sw-image-desc:
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/native_manual_scale_charm_vnf/native_charm_vnfd.yaml
+++ b/charm-packages/native_manual_scale_charm_vnf/native_charm_vnfd.yaml
@@ -68,6 +68,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -88,6 +92,7 @@ vnfd:
    sw-image-desc: ubuntu18.04
    alternative-sw-image-desc:
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml
+++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml
@@ -67,6 +67,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -87,6 +91,7 @@ vnfd:
    sw-image-desc: ubuntu18.04
    alternative-sw-image-desc:
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml
+++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml
@@ -70,6 +70,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -91,6 +95,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage

--- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml
+++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml
@@ -55,6 +55,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: simple_provides
@@ -69,6 +73,7 @@ vnfd:
    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

--- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml
+++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml
@@ -55,6 +55,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: simple_requires
@@ -69,6 +73,7 @@ vnfd:
    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

--- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml
+++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml
@@ -98,6 +98,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: simple_requires
@@ -112,6 +116,7 @@ vnfd:
    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
@@ -128,6 +133,7 @@ vnfd:
    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

--- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml
+++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml
@@ -53,6 +53,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config
    id: hackfest_basic_metrics-VM
@@ -80,6 +84,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: hackfest_basic_metrics-VM-compute
    virtual-storage-desc:
    - hackfest_basic_metrics-VM-storage

--- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
+++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
@@ -30,6 +30,10 @@ vnfd:
    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
  vdu:
  - id: hackfest_basic-VM
    name: hackfest_basic-VM
@@ -37,6 +41,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: hackfest_basic-VM-compute
    virtual-storage-desc:
    - hackfest_basic-VM-storage

--- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
+++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
@@ -41,6 +41,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: mgmtVM
@@ -63,6 +67,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage
@@ -86,6 +91,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: dataVM-compute
    virtual-storage-desc:
    - dataVM-storage

--- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml
+++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml
@@ -40,6 +40,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:
@@ -61,6 +65,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu20.04-aws
    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
    virtual-compute-desc: mgmtVM-compute
    virtual-storage-desc:
    - mgmtVM-storage
@@ -84,6 +89,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu20.04-aws
    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
    virtual-compute-desc: dataVM-compute
    virtual-storage-desc:
    - dataVM-storage

--- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
+++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
@@ -39,6 +39,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:
@@ -59,6 +63,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
@@ -75,6 +80,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

--- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
+++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
@@ -52,6 +52,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: policyVM
@@ -74,6 +78,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: policyVM-compute
    virtual-storage-desc:
    - policyVM-storage

--- a/nscharm_user_vnf/nscharm_user_vnfd.yaml
+++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml
@@ -52,6 +52,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    id: userVM
@@ -74,6 +78,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: userVM-compute
    virtual-storage-desc:
    - userVM-storage

--- a/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml
+++ b/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml
@@ -39,6 +39,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    description: ubuntu_slice-VM
@@ -70,6 +74,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: ubuntu_slice-VM-compute
    virtual-storage-desc:
    - ubuntu_slice-VM-storage

--- a/slice_basic_vnf/slice_basic_vnfd.yaml
+++ b/slice_basic_vnf/slice_basic_vnfd.yaml
@@ -35,6 +35,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-config.txt
    description: ubuntu_slice-VM
@@ -59,6 +63,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: ubuntu_slice-VM-compute
    virtual-storage-desc:
    - ubuntu_slice-VM-storage

--- a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml
+++ b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml
@@ -38,6 +38,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:
  - cloud-init-file: cloud-config.txt
    id: dataVM
@@ -70,6 +74,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

--- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
+++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
@@ -31,6 +31,10 @@ vnfd:
    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
  vdu:
  - cloud-init-file: cloud-init.cfg
    description: ubuntu_cloudinit-vnf-VM
@@ -46,6 +50,7 @@ vnfd:
    alternative-sw-image-desc:
    - ubuntu18.04-aws
    - ubuntu18.04-azure
+    - ubuntu18.04-gcp
    virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute
    virtual-storage-desc:
    - ubuntu_cloudinit-vnf-VM-storage