Commit cbd0fbd8 authored by aguilarherna's avatar aguilarherna
Browse files

updated hackfest_epasriov_vnf: ubuntu20, cleaned cloud-init-file 



Signed-off-by: default avataraguilarherna <daguilarh@indra.es>
parent 779d08eb

hackfest_epasriov_vnf/cloud_init/cloud-config.txt

+0 −37
Original line number Diff line number Diff line
@@ -13,43 +13,6 @@ write_files: 
    owner: root:root

    permissions: '0644'

    path: /root/helloworld.txt

-   content: |

        network:

            version: 2

            ethernets:

                eth0:

                    dhcp4: true

                    dhcp6: true

                eth1:

                    dhcp4: true

                    dhcp6: true



    owner: root:root

    permissions: '0644'

    path: /etc/netplan/01-netcfg.yaml

-   content: |

        #!/bin/sh -eux

        

        ubuntu_version="`lsb_release -r | awk '{print $2}'`";

        major_version="`echo $ubuntu_version | awk -F. '{print $1}'`";

        

        if [ "$major_version" -ge "16" ]; then

          # Disable Predictable Network Interface names and use eth0

          sed -i 's/en[[:alnum:]]*/eth0/g' /etc/network/interfaces;

          sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevname=0 \1"/g' /etc/default/grub;

          update-grub;

        fi



    owner: root:root

    permissions: '0750'

    path: /root/networking.sh

runcmd:

-   [ sh, -c, "chown ubuntu:ubuntu /home/ubuntu/test4.pem" ]

-   [ mv, /etc/netplan/50-cloud-init.yaml, /etc/netplan/50-cloud-init.yaml.bak ]

-   [ sh, -c, "/root/networking.sh" ]

power_state:

    mode: reboot

    message: Bye Bye

    timeout: 5

    condition: True

hackfest_epasriov_vnf/hackfest_epasriov_vnfd.yaml

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

  product-name: hackfest_epasriov-vnf

  sw-image-desc:

  - id: ubuntu18.04

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu20.04

    image: ubuntu20.04

    name: ubuntu20.04

  - id: hackfest-pktgen

    image: hackfest-pktgen

    name: hackfest-pktgen
@@ -54,7 +54,7 @@ vnfd: 
        virtual-interface:

          type: PARAVIRT

    name: mgmtVM

    sw-image-desc: ubuntu18.04

    sw-image-desc: ubuntu20.04

    virtual-compute-desc: mgmtVM-compute

    virtual-storage-desc:

    - mgmtVM-storage