underpost 2.8.815 → 2.8.817

package/README.md

@@ -68,7 +68,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.815
+## underpost ci/cd cli v2.8.817
 
 ### Usage: `underpost [options] [command]`
   ```

package/bin/deploy.js

@@ -69,7 +69,9 @@ const keyboardSteps = [
   `sudo dpkg-reconfigure --frontend noninteractive keyboard-configuration`,
   `sudo systemctl restart keyboard-setup.service`,
 ];
-// #  - ${JSON.stringify([...timeZoneSteps, ...chronySetUp(chronyConfPath)])}
+
+const kernelLibVersion = `6.8.0-41-generic`;
+
 const installSteps = [
   `cat <<EOF | tee /etc/apt/sources.list
 deb http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
@@ -79,7 +81,11 @@ EOF`,
 
   `apt update -qq`,
   `apt -y full-upgrade`,
-  `apt install -y xinput x11-xkb-utils usbutils`,
+  `apt install -y build-essential xinput x11-xkb-utils usbutils`,
+  'apt install -y linux-image-generic',
+  `apt install -y linux-modules-${kernelLibVersion} linux-modules-extra-${kernelLibVersion}`,
+
+  `depmod -a ${kernelLibVersion}`,
   // `apt install -y cloud-init=25.1.2-0ubuntu0~24.04.1`,
   `apt install -y cloud-init systemd-sysv openssh-server sudo locales udev util-linux systemd-sysv iproute2 netplan.io ca-certificates curl wget chrony`,
   `ln -sf /lib/systemd/systemd /sbin/init`,
@@ -89,12 +95,31 @@ EOF`,
   `DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata kmod keyboard-configuration console-setup iputils-ping`,
 ];
 
+const bootCmdSteps = [
+  `/underpost/dns.sh`,
+  `/underpost/host.sh`,
+  // `/underpost/date.sh`,
+  `cp -a /underpost/90_maas.cfg /etc/cloud/cloud.cfg.d/90_maas.cfg`,
+];
+
+const cloudInitReset = `sudo cloud-init clean --logs --seed --configs all --machine-id
+sudo rm -rf /var/lib/cloud/*`;
+
+const cloudConfigCmdRunFactory = (steps = []) =>
+  steps
+    .map(
+      (step, i, a) =>
+        '  - echo "\\$(date) | ' + (i + 1) + '/' + a.length + ' - ' + step.split('\n')[0] + '"' + `\n` + `  - ${step}`,
+    )
+    .join('\n');
+
 const cloudConfigFactory = (
-  { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
-  { consumer_key, consumer_token, secret },
+  { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip, reset },
+  { consumer_key, consumer_secret, token_key, token_secret },
+  path = '/etc/cloud/cloud.cfg.d/90_maas.cfg',
 ) => [
   // Configure cloud-init for MAAS
-  `cat <<EOF_MAAS_CFG > /etc/cloud/cloud.cfg.d/90_maas.cfg
+  `cat <<EOF_MAAS_CFG > ${path}
 #cloud-config
 
 hostname: ${host}
@@ -112,16 +137,24 @@ hostname: ${host}
 datasource_list: [ MAAS ]
 datasource:
   MAAS:
-    metadata_url: http://${IP_ADDRESS}:5248/MAAS/metadata
-    consumer_key: ${consumer_key}
-    token_key: ${consumer_token}
-    token_secret: ${secret}
+    metadata_url: http://${IP_ADDRESS}:5240/MAAS/metadata/
+    ${
+      reset
+        ? ''
+        : `consumer_key: ${consumer_key}
+    consumer_secret: ${consumer_secret}
+    token_key: ${token_key}
+    token_secret: ${token_secret}`
+    }
+
 
 users:
-- name: root
+- name: ${process.env.MAAS_ADMIN_USERNAME}
   sudo: ['ALL=(ALL) NOPASSWD:ALL']
   shell: /bin/bash
-  lock_passwd: true
+  lock_passwd: false
+  groups: sudo,users,admin,wheel,lxd
+  plain_text_passwd: '${process.env.MAAS_ADMIN_USERNAME}'
   ssh_authorized_keys:
     - ${fs.readFileSync(`/home/dd/engine/engine-private/deploy/id_rsa.pub`, 'utf8')}
 
@@ -134,18 +167,15 @@ users:
 
 # check timedatectl on host
 # timezone: America/Santiago
-# timezone: ${timezone}
-
-# ntp:
-#   enabled: true
-#   servers:
-#     - ${IP_ADDRESS}
-#   ntp_client: chrony
-#   config:
-#     confpath: ${chronyConfPath}
-#     packages:
-#       - chrony
-#     service_name: chrony
+timezone: ${timezone}
+
+ntp:
+  enabled: true
+  servers:
+    - ${process.env.MAAS_NTP_SERVER}
+  ntp_client: chrony
+  config:
+    confpath: ${chronyConfPath}
 
 # ssh:
 #   allow-pw: false
@@ -159,16 +189,17 @@ packages:
   - git
   - htop
   - snapd
+  - chrony
 resize_rootfs: false
 growpart:
-  mode: off
-# network:
-#   version: 2
-#   ethernets:
-#     ${process.env.RPI4_INTERFACE_NAME}:
-#         dhcp4: true
-#         addresses:
-#           - ${ipaddr}/24
+  mode: false
+network:
+  version: 2
+  ethernets:
+    ${process.env.RPI4_INTERFACE_NAME}:
+      dhcp4: true
+      addresses:
+        - ${ipaddr}/24
 #         routes:
 #           - to: default
 #             via: ${gatewayip}
@@ -178,7 +209,7 @@ growpart:
 #   users:
 #   - {name: root, password: changeme, type: text}
 
-final_message: "The system is up, after $UPTIME seconds"
+final_message: "====== Cloud init finished ======"
 
 # power_state:
 #   mode: reboot
@@ -189,10 +220,53 @@ bootcmd:
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
   - echo "Init bootcmd"
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+${cloudConfigCmdRunFactory(bootCmdSteps)}
 runcmd:
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
   - echo "Init runcmd"
   - echo "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+
+# If this is set, 'root' will not be able to ssh in and they
+# will get a message to login instead as the default $user
+disable_root: true
+
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: false
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+  - migrator
+  - bootcmd
+  - write-files
+  - growpart
+  - resizefs
+  - set_hostname
+  - update_etc_hosts
+  - rsyslog
+  - users-groups
+  - ssh
+
+cloud_config_modules:
+  - mounts
+  - locale
+  - set-passwords
+  - package-update-upgrade-install
+  - timezone
+  - runcmd
+  - ssh-import-id
+  - ntp
+
+cloud_final_modules:
+  - rightscale_userdata
+  - scripts-per-once
+  - scripts-per-boot
+  - scripts-per-instance
+  - scripts-user
+  - ssh-authkey-fingerprints
+  - keys-to-console
+  - phone-home
+  - final-message
+
 EOF_MAAS_CFG`,
 ];
 
@@ -211,7 +285,9 @@ EOF_OUTER`;
   shellExec(cmd);
 };
 
-const chronySetUp = (path) => {
+const chronySetUp = (path, alias = 'chrony') => {
+  // use alias = 'chronyd' for RHEL
+  // use alias = 'chrony' for Ubuntu
   return [
     `echo '
 # Use public servers from the pool.ntp.org project.
@@ -254,25 +330,25 @@ logdir /var/log/chrony
 # Select which information is logged.
 #log measurements statistics tracking
 ' > ${path} `,
-    `sudo systemctl stop chronyd`,
+    `systemctl stop ${alias}`,
+
+    `${alias}d -q 'server ntp.ubuntu.com iburst'`,
 
     // `chronyd -q 'server 0.europe.pool.ntp.org iburst'`,
-    `chronyd -q 'server ntp.ubuntu.com iburst'`,
 
-    `sudo systemctl enable --now chronyd`,
-    `sudo systemctl restart chronyd`,
-    `sudo systemctl status chronyd`,
+    `sudo systemctl enable --now ${alias}`,
+    `sudo systemctl restart ${alias}`,
+    `sudo systemctl status ${alias}`,
 
     `chronyc sources`,
     `chronyc tracking`,
-    // sudo firewall-cmd --add-service=ntp --permanent
-    // sudo firewall-cmd --reload
 
     `chronyc sourcestats -v`,
+    `timedatectl status`,
   ];
 };
 
-const installUbuntuUnderpostTools = (nfsHostPath) => {
+const installUbuntuUnderpostTools = ({ nfsHostPath, host }) => {
   fs.mkdirSync(`${nfsHostPath}/underpost`, { recursive: true });
 
   logger.info('Build', `${nfsHostPath}/underpost/date.sh`);
@@ -284,6 +360,20 @@ ${chronySetUp(chronyConfPath).join('\n')}
     'utf8',
   );
 
+  logger.info('Build', `${nfsHostPath}/underpost/host.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/host.sh`,
+    `echo -e "127.0.0.1   localhost\n127.0.1.1   ${host}" | tee -a /etc/hosts`,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/keys.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/keys.sh`,
+    `cat /etc/cloud/cloud.cfg.d/90_maas.cfg | grep -C 5 'metadata'`,
+    'utf8',
+  );
+
   logger.info('Build', `${nfsHostPath}/underpost/keyboard.sh`);
   fs.writeFileSync(
     `${nfsHostPath}/underpost/keyboard.sh`,
@@ -302,11 +392,30 @@ ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf`,
     'utf8',
   );
 
+  logger.info('Build', `${nfsHostPath}/underpost/start.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/start.sh`,
+    `#!/bin/bash
+set -x
+sudo cloud-init --all-stages
+    `,
+    'utf8',
+  );
+
+  logger.info('Build', `${nfsHostPath}/underpost/reset.sh`);
+  fs.writeFileSync(
+    `${nfsHostPath}/underpost/reset.sh`,
+    `${cloudInitReset}
+${bootCmdSteps.join('\n')}`,
+    'utf8',
+  );
+
   logger.info('Build', `${nfsHostPath}/underpost/help.sh`);
   fs.writeFileSync(
     `${nfsHostPath}/underpost/help.sh`,
     `echo "=== Cloud init utils ==="
 echo "sudo cloud-init --all-stages"
+echo "sudo cloud-init clean --logs --seed --configs all --machine-id --reboot"
 echo "sudo cloud-init init --local"
 echo "sudo cloud-init init"
 echo "sudo cloud-init modules --mode=config"
@@ -342,7 +451,12 @@ cut -d: -f1 /etc/passwd
     `chmod +x /underpost/dns.sh`,
     `chmod +x /underpost/help.sh`,
     `chmod +x /underpost/config-path.sh`,
+    `chmod +x /underpost/host.sh`,
+    `chmod +x /underpost/keys.sh`,
     `chmod +x /underpost/test.sh`,
+    `chmod +x /underpost/start.sh`,
+    `chmod +x /underpost/reset.sh`,
+    chronySetUp(chronyConfPath)[0],
     `sudo chmod 700 ~/.ssh/`,
     `sudo chmod 600 ~/.ssh/authorized_keys`,
     `sudo chmod 644 ~/.ssh/known_hosts`,
@@ -355,29 +469,38 @@ cut -d: -f1 /etc/passwd
 
 const updateVirtualRoot = async ({ IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip }) => {
   // <consumer_key>:<consumer_token>:<secret>
-  let [consumer_key, consumer_token, secret] = process.argv.includes('reset')
-    ? shellExec(`maas apikey --username ${process.env.MAAS_ADMIN_USERNAME}`, {
-        stdout: true,
-      })
-        .trim()
-        .split(`\n`)[0]
-        .split(':')
-    : shellExec(`maas apikey --generate --username ${process.env.MAAS_ADMIN_USERNAME}`, {
-        stdout: true,
-      })
-        .trim()
-        .split(':');
-
-  if (process.argv.includes('reset')) secret = '&' + secret;
-
-  logger.info('Maas api token generated', { consumer_key, consumer_token, secret });
+  // <consumer_key>:<consumer_secret>:<token_key>:<token_secret>
+  // maas apikey --with-names --username ${process.env.MAAS_ADMIN_USERNAME}
+  // maas ${process.env.MAAS_ADMIN_USERNAME} account create-authorisation-token
+  // maas apikey --generate --username ${process.env.MAAS_ADMIN_USERNAME}
+  // https://github.com/CanonicalLtd/maas-docs/issues/647
+
+  const parts = shellExec(`maas apikey --with-names --username ${process.env.MAAS_ADMIN_USERNAME}`, {
+    stdout: true,
+  })
+    .trim()
+    .split(`\n`)[0]
+    .split(':');
+
+  let consumer_key, consumer_secret, token_key, token_secret;
+
+  if (parts.length === 4) {
+    [consumer_key, consumer_secret, token_key, token_secret] = parts;
+  } else if (parts.length === 3) {
+    [consumer_key, token_key, token_secret] = parts;
+    consumer_secret = '""';
+    token_secret = token_secret.split(' MAAS consumer')[0].trim();
+  } else {
+    throw new Error('Invalid token format');
+  }
+
+  logger.info('Maas api token generated', { consumer_key, consumer_secret, token_key, token_secret });
 
   if (update) {
     // --reboot
     if (process.argv.includes('reset'))
       shellExec(`sudo chroot ${nfsHostPath} /usr/bin/qemu-aarch64-static /bin/bash <<'EOF'
-sudo cloud-init clean --logs --seed --configs all --machine-id
-sudo rm -rf /var/lib/cloud/*
+${cloudInitReset}
 EOF`);
 
     if (fs.existsSync(`${nfsHostPath}/var/log/`)) {
@@ -410,15 +533,38 @@ EOF`);
   runSteps(
     nfsHostPath,
     cloudConfigFactory(
-      { IP_ADDRESS, architecture, host, nfsHostPath, ipaddr, update, gatewayip },
       {
-        consumer_key,
-        consumer_token,
-        secret,
+        reset: process.argv.includes('reset') ? true : false,
+        IP_ADDRESS,
+        architecture,
+        host,
+        nfsHostPath,
+        ipaddr,
+        update,
+        gatewayip,
       },
+      { consumer_key, consumer_secret, token_key, token_secret },
     ),
   );
-  installUbuntuUnderpostTools(nfsHostPath);
+
+  runSteps(
+    nfsHostPath,
+    cloudConfigFactory(
+      {
+        IP_ADDRESS,
+        architecture,
+        host,
+        nfsHostPath,
+        ipaddr,
+        update,
+        gatewayip,
+      },
+      { consumer_key, consumer_secret, token_key, token_secret },
+      '/underpost/90_maas.cfg',
+    ),
+  );
+
+  installUbuntuUnderpostTools({ nfsHostPath, host });
 };
 
 try {
@@ -1604,7 +1750,9 @@ EOF`);
       dotenv.config({ path: `${getUnderpostRootPath()}/.env`, override: true });
       const IP_ADDRESS = getLocalIPv4Address();
       const serverip = IP_ADDRESS;
-      const tftpRoot = process.env.TFTP_ROOT;
+      const tftpRoot = process.argv.includes('v3.0')
+        ? `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718`
+        : process.env.TFTP_ROOT;
       const ipaddr = process.env.RPI4_IP;
       const netmask = process.env.NETMASK;
       const gatewayip = process.env.GATEWAY_IP;
@@ -1854,7 +2002,9 @@ EOF`);
         zipFirmwareName,
         zipFirmwareUrl,
         interfaceName,
-        nfsHost;
+        nfsHost,
+        bootResourcesPath,
+        bootKernelPath;
 
       switch (process.argv[3]) {
         case 'rpi4mb':
@@ -1872,7 +2022,7 @@ EOF`);
           resource = resources.find((o) => o.architecture === 'arm64/ga-24.04' && o.name === 'ubuntu/noble');
           name = resource.name;
           architecture = resource.architecture;
-          resource = resources.find((o) => o.name === name && o.architecture === architecture);
+          // resource = resources.find((o) => o.name === name && o.architecture === architecture);
           nfsServerRootPath = `${process.env.NFS_EXPORT_PATH}/rpi4mb`;
           // ,anonuid=1001,anongid=100
           // etcExports = `${nfsServerRootPath} *(rw,all_squash,sync,no_root_squash,insecure)`;
@@ -1884,21 +2034,33 @@ EOF`);
             'no_subtree_check',
             'insecure',
           ]})`;
-          const resourceData = JSON.parse(
-            shellExec(`maas ${process.env.MAAS_ADMIN_USERNAME} boot-resource read ${resource.id}`, {
-              stdout: true,
-              silent: true,
-              disableLog: true,
-            }),
-          );
-          const bootFiles = resourceData.sets[Object.keys(resourceData.sets)[0]].files;
-          const suffix = architecture.match('xgene') ? '.xgene' : '';
+          if (process.argv.includes('v3.0')) {
+            bootResourcesPath = `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718`;
+            bootKernelPath = `/var/snap/maas/common/maas/boot-resources/snapshot-20250720-162718/ubuntu/arm64/hwe-24.04/noble/stable`;
+            kernelFilesPaths = {
+              'vmlinuz-efi': `${bootKernelPath}/boot-kernel`,
+              'initrd.img': `${bootKernelPath}/boot-initrd`,
+              squashfs: `${bootKernelPath}/squashfs`,
+            };
+          } else {
+            const resourceData = JSON.parse(
+              shellExec(`maas ${process.env.MAAS_ADMIN_USERNAME} boot-resource read ${resource.id}`, {
+                stdout: true,
+                silent: true,
+                disableLog: true,
+              }),
+            );
+            const bootFiles = resourceData.sets[Object.keys(resourceData.sets)[0]].files;
+            const suffix = architecture.match('xgene') ? '.xgene' : '';
+            bootResourcesPath = `/var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64`;
+            bootKernelPath = `/var/snap/maas/common/maas/image-storage`;
+            kernelFilesPaths = {
+              'vmlinuz-efi': `${bootKernelPath}/${bootFiles['boot-kernel' + suffix].filename_on_disk}`,
+              'initrd.img': `${bootKernelPath}/${bootFiles['boot-initrd' + suffix].filename_on_disk}`,
+              squashfs: `${bootKernelPath}/${bootFiles['squashfs'].filename_on_disk}`,
+            };
+          }
 
-          kernelFilesPaths = {
-            'vmlinuz-efi': bootFiles['boot-kernel' + suffix].filename_on_disk,
-            'initrd.img': bootFiles['boot-initrd' + suffix].filename_on_disk,
-            squashfs: bootFiles['squashfs'].filename_on_disk,
-          };
           const protocol = 'tcp'; // v3 -> tcp, v4 -> udp
 
           const mountOptions = [
@@ -1925,6 +2087,7 @@ EOF`);
           ];
           const cmd = [
             `console=serial0,115200`,
+            // `console=ttyAMA0,115200`,
             `console=tty1`,
             // `initrd=-1`,
             // `net.ifnames=0`,
@@ -1948,6 +2111,12 @@ EOF`);
             // 'ip=dfcp',
             // 'autoinstall',
             // 'rd.break',
+
+            // Disable services that not apply over nfs
+            `systemd.mask=systemd-network-generator.service`,
+            `systemd.mask=systemd-networkd.service`,
+            `systemd.mask=systemd-fsck-root.service`,
+            `systemd.mask=systemd-udev-trigger.service`,
           ];
 
           // TODO: use autoinstall cloud-config-url=http://<MAAS_IP>:5240/MAAS/metadata/latest
@@ -2022,52 +2191,18 @@ BOOT_ORDER=0x21`;
       switch (process.argv[3]) {
         case 'rpi4mb':
           {
-            // subnet DHCP snippets
-            // # UEFI ARM64
-            // if option arch = 00:0B {
-            //   filename "rpi4mb/pxe/grubaa64.efi";
-            // }
-            // elsif option arch = 00:13 {
-            //   filename "http://<IP_ADDRESS>:5248/images/bootloaders/uefi/arm64/grubaa64.efi";
-            //   option vendor-class-identifier "HTTPClient";
-            // }
             for (const file of ['bootaa64.efi', 'grubaa64.efi']) {
-              shellExec(
-                `sudo cp -a /var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64/${file} ${tftpRoot}${tftpSubDir}/pxe/${file}`,
-              );
+              shellExec(`sudo cp -a ${bootResourcesPath}/${file} ${tftpRoot}${tftpSubDir}/pxe/${file}`);
             }
-            // const file = 'bcm2711-rpi-4-b.dtb';
-            // shellExec(
-            //   `sudo cp -a  ${firmwarePath}/${file} /var/snap/maas/common/maas/image-storage/bootloaders/uefi/arm64/${file}`,
-            // );
-
-            // const ipxeSrc = fs
-            //   .readFileSync(`${tftpRoot}/ipxe.cfg`, 'utf8')
-            //   .replaceAll('amd64', 'arm64')
-            //   .replaceAll('${next-server}', IP_ADDRESS);
-            // fs.writeFileSync(`${tftpRoot}/ipxe.cfg`, ipxeSrc, 'utf8');
 
             {
               for (const file of Object.keys(kernelFilesPaths)) {
-                shellExec(
-                  `sudo cp -a /var/snap/maas/common/maas/image-storage/${kernelFilesPaths[file]} ${tftpRoot}${tftpSubDir}/pxe/${file}`,
-                );
+                shellExec(`sudo cp -a ${kernelFilesPaths[file]} ${tftpRoot}${tftpSubDir}/pxe/${file}`);
               }
-              // const configTxtSrc = fs.readFileSync(`${firmwarePath}/config.txt`, 'utf8');
-              // fs.writeFileSync(
-              //   `${tftpRoot}${tftpSubDir}/config.txt`,
-              //   configTxtSrc
-              //     .replace(`kernel=kernel8.img`, `kernel=vmlinuz`)
-              //     .replace(`# max_framebuffers=2`, `max_framebuffers=2`)
-              //     .replace(`initramfs initramfs8 followkernel`, `initramfs initrd.img followkernel`),
-              //   'utf8',
-              // );
-
-              // grub:
-              // set root=(pxe)
-
-              // UNDERPOST.NET UEFI/GRUB/MAAS RPi4 commissioning (ARM64)
-              const menuentryStr = 'underpost.net rpi4mb maas commissioning (ARM64)';
+
+              fs.mkdirSync(`${tftpRoot}/grub`, { recursive: true });
+
+              const menuentryStr = 'UNDERPOST.NET UEFI/GRUB/MAAS RPi4 commissioning (ARM64)';
               const grubCfgPath = `${tftpRoot}/grub/grub.cfg`;
               fs.writeFileSync(
                 grubCfgPath,
@@ -2171,29 +2306,30 @@ BOOT_ORDER=0x21`;
           };
           machine.hostname = machine.hostname.replaceAll(' ', '').replaceAll('.', '');
 
-          try {
-            let newMachine = shellExec(
-              `maas ${process.env.MAAS_ADMIN_USERNAME} machines create ${Object.keys(machine)
-                .map((k) => `${k}="${machine[k]}"`)
-                .join(' ')}`,
-              {
-                silent: true,
-                stdout: true,
-              },
-            );
-            newMachine = machineFactory(JSON.parse(newMachine));
-            machines.push(newMachine);
-            console.log(newMachine);
-            // commissioning_scripts=90-verify-user.sh
-            shellExec(
-              `maas ${process.env.MAAS_ADMIN_USERNAME} machine commission ${newMachine.system_id} enable_ssh=1 skip_bmc_config=1 skip_networking=1 skip_storage=1`,
-              {
-                silent: true,
-              },
-            );
-          } catch (error) {
-            logger.error(error, error.stack);
-          }
+          if (machine.hostname.match('generic-host'))
+            try {
+              let newMachine = shellExec(
+                `maas ${process.env.MAAS_ADMIN_USERNAME} machines create ${Object.keys(machine)
+                  .map((k) => `${k}="${machine[k]}"`)
+                  .join(' ')}`,
+                {
+                  silent: true,
+                  stdout: true,
+                },
+              );
+              newMachine = machineFactory(JSON.parse(newMachine));
+              machines.push(newMachine);
+              console.log(newMachine);
+              // commissioning_scripts=90-verify-user.sh
+              shellExec(
+                `maas ${process.env.MAAS_ADMIN_USERNAME} machine commission ${newMachine.system_id} enable_ssh=1 skip_bmc_config=1 skip_networking=1 skip_storage=1`,
+                {
+                  silent: true,
+                },
+              );
+            } catch (error) {
+              logger.error(error, error.stack);
+            }
         }
         // if (discoveries.length > 0) {
         //   shellExec(
@@ -2328,7 +2464,6 @@ udp-port = 32766
       shellExec(`sudo mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc`);
 
       if (process.argv.includes('build')) {
-        // shellExec(`depmod -a`);
         shellExec(`mkdir -p ${nfsHostPath}`);
         let cmd;
         switch (host) {

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.815
+## underpost ci/cd cli v2.8.817
 
 ### Usage: `underpost [options] [command]`
   ```

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.815'
+      engine.version: '2.8.817'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.815
+          image: localhost/rockylinux9-underpost:v2.8.817
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.815
+          image: localhost/rockylinux9-underpost:v2.8.817
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/maas/maas-setup.sh

@@ -2,6 +2,7 @@
 set -euo pipefail
 
 sudo snap install jq
+# sudo snap install --channel=3.0/stable maas
 sudo snap install maas
 
 # Get default interface and IP address

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.815",
+    "version": "2.8.817",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/index.js

@@ -32,7 +32,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.815';
+  static version = 'v2.8.817';
   /**
    * Repository cli API
    * @static