v3.3.0 (#99)

* Added support for Ubuntu 24.04
* Removed support for Ubuntu 18.04
* Fixed VM cleanup provisioning bug
* Fixed memory upgrade on node reconfiguration

Co-authored-by: Ethernity CLOUD <contact@ethernity.cloud>

Author: iosifpeterfi

README.md

@@ -32,20 +32,17 @@ DELL Optiplex 5040
 Currently the following operating systems are suported:
 
 ```
-Ubuntu 18.04
 Ubuntu 20.04
 Ubuntu 22.04
-
+Ubuntu 24.04
 ```
 
 We are planning support for the following operating systems:
 
 ```
-Debian 10*
-Fedora 30*
-CentOS 7*
-RHEL 8*
-
+Debian 12*
+Fedora 41*
+Rocky 9*
 ```
 
 ## Installation
@@ -162,4 +159,4 @@ $ ./etny-node-installer.sh
 ### 2. Run the script again after system restart
 ```
 $ cd mvp-pox-node
-$ ./etny-node-installer.sh
+$ ./etny-node-installer.sh

etny-node-installer.sh

@@ -30,10 +30,6 @@ choose_network() {
     read -p "Enter your choice: " choice
     case $choice in
         1)  # Check Ubuntu kernel version
-            if [ "$os" != 'Ubuntu 20.04' ] && [ "$os" != 'Ubuntu 22.04' ]; then
-            	echo "You need to upgrade your Ubuntu OS to at least version 20.04 or 22.04 to proceed with the installation."
-            	exit 1
-            fi
             echo "You selected Automatic. This option will set polygon Mainnet if your wallet has MATIC, otherwise will set bloxberg Mainnet."
             export NETWORK=AUTO
 	    read -p "Do you want to use the default RPC? [Y/n]: " use_default_rpc
@@ -51,10 +47,6 @@ choose_network() {
             break
             ;;
         2)  # Check Ubuntu kernel version
-            if [ "$os" != 'Ubuntu 20.04' ] && [ "$os" != 'Ubuntu 22.04' ]; then
-                echo "You need to upgrade your Ubuntu OS to at least version 20.04 or 22.04 to proceed with the installation."
-                exit 1
-            fi
             echo "You selected Mainnet on POLYGON."
             export NETWORK=POLYGON
             read -p "Do you want to use the default POLYGON RPC? [Y/n]: " use_default_rpc
@@ -69,10 +61,6 @@ choose_network() {
 	    break
             ;;
         3)  # Check Ubuntu kernel version
-            if [ "$os" != 'Ubuntu 20.04' ] && [ "$os" != 'Ubuntu 22.04' ]; then
-                echo "You need to upgrade your Ubuntu OS to at least version 20.04 or 22.04 to proceed with the installation."
-                exit 1
-            fi
             echo "You selected Open Beta."
             export NETWORK=AMOY
             read -p "Do you want to use the default AMOY RPC? [Y/n]: " use_default_rpc
@@ -87,10 +75,6 @@ choose_network() {
 	    break
 	    ;;
         4)  # Check Ubuntu kernel version
-            if [ "$os" != 'Ubuntu 20.04' ] && [ "$os" != 'Ubuntu 22.04' ]; then
-                echo "You need to upgrade your Ubuntu OS to at least version 20.04 or 22.04 to proceed with the installation."
-                exit 1
-            fi
             echo "You selected Open Beta."
             export NETWORK=BLOXBERG
             read -p "Do you want to use the default Bloxberg RPC? [Y/n]: " use_default_rpc
@@ -461,12 +445,12 @@ case $(awk '/^VERSION_ID=/' /etc/*-release 2>/dev/null | awk -F'=' '{ print tolo
     20.04) 
         os='Ubuntu 20.04'
         ubuntu_20_04;;
-    18.04) 
-        os='Ubuntu 18.04'
-        ubuntu_20_04;;
     22.04) 
         os='Ubuntu 22.04'
         ubuntu_20_04;;
+    24.04)
+        os='Ubuntu 24.04'
+        ubuntu_20_04;;
     *) echo "Version not supported. Exiting..."
 esac
 }

etny-node-vm-configuration.sh

@@ -3,10 +3,10 @@
 # Define minimum and recommended settings
 MIN_MEMORY_MB=3072 #MB
 MIN_CPUS=2
-MIN_DISK=80 #GB
+MIN_DISK=128 #GB
 
 REC_MEMORY_MB=7168 #MB
-REC_CPUS=2
+REC_CPUS=4
 REC_DISK=200 #GB
 
 # Function to get available resources
@@ -53,7 +53,7 @@ if ((new_cpus < MIN_CPUS || new_cpus > available_cpus)); then
 fi
 
 # Prompt for additional storage
-read -p "Enter additional allocated storage (GB) (minimum $MIN_DISK, recommended $REC_DISK): " additional_storage
+read -p "Enter allocated storage (GB) (minimum $MIN_DISK, recommended $REC_DISK): " additional_storage
 
 # Calculate the new total storage size
 total_storage=$(echo "$available_disk_size + $additional_storage" | bc)
@@ -74,13 +74,22 @@ modify_vagrantfile
 
 echo "Backup of the original Vagrantfile created: Vagrantfile.bak"
 echo "Vagrantfile updated successfully!"
+echo "Reloading vagrant..."
 
 # Reload Vagrant
-vagrant reload
+vagrant reload > /dev/null 2>&1
+sleep 60
+vagrant up > /dev/null 2>&1
 echo "Vagrant reloaded successfully!"
 
+# Resize Memory
+echo "Setting up memory size"
+VAGRANT_ID=`vagrant status | grep etny | awk '{print $1}'`
+VMID=`virsh list | grep $VAGRANT_ID | awk '{print $2}'`
+virsh setmem --domain ${VMID} ${new_memory_MB}M --live
+
 # Resize VM disk
-vagrant ssh -c "sudo lvextend -l +100%FREE /dev/ubuntu-vg/ubuntu-lv"
+echo "Extending partition"
+vagrant ssh -c "sudo lvextend -l+100%FREE /dev/ubuntu-vg/ubuntu-lv"
 vagrant ssh -c "sudo resize2fs /dev/mapper/ubuntu--vg-ubuntu--lv"
-echo "Disk resized successfully!"
 echo "Configuration done"

roles/install_node/tasks/debian_24.yml

@@ -0,0 +1,53 @@
+---
+
+- name: Ubuntu 24.04 | qemu dependency packages
+  apt:
+    pkg:
+      - policycoreutils-python-utils
+      - libfdt1
+      - libvirt-clients
+      - libvirt-daemon-system
+      - bridge-utils
+      - python3-libvirt
+      - libnss-libvirt
+      - libguestfs-tools
+      - virtinst
+      - virt-top
+      - genisoimage
+      - cpu-checker  
+    state: present
+- name: Ubuntu 24.04 | "Installing qemu"
+  apt:
+    pkg:
+      - qemu-system-data
+      - qemu-utils
+      - qemu-system-common
+      - qemu-system-x86
+      - qemu-utils
+    state: present
+- name:  Ubuntu 24.04 | vagrant add key  
+  apt_key:
+    url: https://apt.releases.hashicorp.com/gpg
+- name: Ubuntu 24.04 | vagrant repo
+  apt_repository:
+    repo: "deb [arch=amd64] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main"
+- name: Ubuntu 24.04 | vagrant install
+  apt:
+    pkg:
+    - vagrant
+- name: Ubuntu 24.04 | vagrant-libvirt packages
+  apt:
+    pkg:
+      - ebtables
+      - dnsmasq-base
+      - libxslt-dev
+      - libxml2-dev
+      - libvirt-dev
+      - zlib1g-dev
+      - ruby-dev
+    state: present
+- name: Ubuntu 24.04 | vagrant template
+  copy:
+    src: vagrant/qemu-8.2
+    dest: Vagrantfile
+    force: yes

roles/install_node/tasks/main.yml

@@ -32,14 +32,14 @@
   script: ubuntu/etny-node-provision-sgx.sh
   when: "sgx_enclave_driver.rc != 0"
 
-- name: Ubuntu 20.04 | enable_sgx dependencies
+- name: Ubuntu | enable_sgx dependencies
   apt:
     pkg:
       - make-guile
       - gcc
-- name: Ubuntu 20.04 | build enable_sgx
+- name: Ubuntu | build enable_sgx
   shell: make all -C sgx/
-- name: Ubuntu 20.04 | run enable_sgx
+- name: Ubuntu | run enable_sgx
   shell: sgx/sgx_enable
   register: sgx_register
 - name: "Print message"
@@ -136,16 +136,17 @@
 - name: vagrant - get VM name
   shell: virsh list --name --state-running
   register: vagrant_vm_name_running
-- name: vagrant - cleanup VM
-  shell: virsh shutdown {{ vagrant_vm_name.stdout }}
+- name: vagrant - shutting down VM 
+  shell: virsh shutdown {{ vagrant_vm_name.stdout }} --mode acpi && sleep 60
   when: 
     - vagrant_vm_name.stdout != ''
     - vagrant_vm_name_running.stdout != ''
-- name: vagrant - cleanup VM
+- name: vagrant - unset VM vars
   shell: virsh undefine {{ vagrant_vm_name.stdout }}
   when: vagrant_vm_name.stdout != ''
 - name: vagrant - cleanup VM
-  shell: vagrant destroy -f && sleep 60
+  shell: vagrant destroy -f; sleep 60
+  ignore_errors: true
   #when: ansible_facts.services['etny-vagrant.service'].state != 'running'
 - name: vagrant - provision VM
   shell: vagrant up --provider=libvirt

roles/uoi-io.libvirt/vars/Debian_24.yml

@@ -0,0 +1,9 @@
+---
+# file: roles/libvirt/vars/Debian.yml
+libvirt_packages:
+  - libvirt-daemon-system
+libvirt_daemon_config_file: /etc/default/libvirtd 
+libvirt_config_file: /etc/libvirt/libvirtd.conf
+libvirt_qemu_config_file: /etc/libvirt/qemu.conf
+libvirt_daemon_config:
+  - { option: 'libvirtd_opts', value: 'libvirtd_opts=""' }

vagrant/qemu-8.2

@@ -0,0 +1,82 @@
+#
+# Copyright (C) 2018, 2019 Ethernity HODL UG
+#
+# This file is part of ETHERNITY NODE.
+#
+# ETHERNITY SC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+Vagrant.configure("2") do |config|
+  interface = `ip a | grep '2:' | head -1 | awk '{print $2}' | awk -F ':' '{print $1}'`
+  
+  config.vm.define :etnyvm1 do |etnyvm1|
+    etnyvm1.vm.box = "generic/ubuntu2204"
+    etnyvm1.vm.provider :libvirt do |domain|
+      domain.memory = 3072
+      domain.cpus = 2 
+      domain.cpu_mode = 'maximum'
+      domain.nested = true
+      domain.kvm_hidden = false
+      domain.machine_virtual_size = 128
+      domain.disk_driver :cache => 'none'
+      domain.qemuargs :value => '-cpu'
+      domain.qemuargs :value => 'host,+sgx'
+      domain.qemuargs :value => '-object'
+      domain.qemuargs :value => 'memory-backend-epc,id=mem1,size=64M,prealloc=on'
+      domain.qemuargs :value => '-M'
+      domain.qemuargs :value => 'sgx-epc.0.memdev=mem1,sgx-epc.0.node=0'
+    end
+    etnyvm1.vm.network :public_network,
+      :dev => interface.strip!,
+      :mode => 'vepa',
+      :type => 'direct'
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-provision-docker.sh", destination: "~/etny/node/etny-node-provision-docker.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-isgx-removal-tool.sh", destination: "~/etny/node/etny-node-isgx-removal-tool.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-provision-sgx.sh", destination: "~/etny/node/etny-node-provision-sgx.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-disable-upgrades.sh", destination: "~/etny/node/etny-node-disable-upgrades.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-provision-python.sh", destination: "~/etny/node/etny-node-provision-python.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-provision-ipfs.sh", destination: "~/etny/node/etny-node-provision-ipfs.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-provision-etny.sh", destination: "~/etny/node/etny-node-provision-etny.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etny-node-start.sh", destination: "~/etny/node/etny-node-start.sh"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etc/systemd/system/etny-node.service", destination: "~/etny/node/etny-node.service"
+    etnyvm1.vm.provision "file", source: "./ubuntu/etc/systemd/system/ipfs.service", destination: "~/etny/node/ipfs.service"
+    etnyvm1.vm.provision "file", source: "./config", destination: "~/etny/node/config"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-provision-sgx.sh"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-provision-docker.sh"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-disable-upgrades.sh" 
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-provision-python.sh"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-provision-ipfs.sh"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/bash /home/vagrant/etny/node/etny-node-provision-etny.sh"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/mv /home/vagrant/etny/node/ipfs.service /etc/systemd/system/"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/systemctl start ipfs.service"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/systemctl enable ipfs.service"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/mv /home/vagrant/etny/node/etny-node.service /etc/systemd/system/"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/systemctl start etny-node.service"
+    etnyvm1.vm.provision "shell",
+      inline: "/bin/systemctl enable etny-node.service"
+    etnyvm1.vm.provision :reload
+
+  end
+end