Merge pull request #12 from KarmaComputing/multiple-lom-systems-bootstrap

Catch up main with bootstrapping branch

Author: NoSpawnn

.gitignore

@@ -1,2 +1,3 @@
-www
-key
+key*
+deploy/serve/www/*
+!deploy/serve/www/bootfile

README.md

@@ -14,7 +14,7 @@ URL=https://192.168.0.230 USERNAME=Administrator PASSWORD=A0F7HKUU VALIDCERT=fal
 
 ## How to Use This
 
-1. Building (NOTE: Ensure you are running the scripts from the `deploy/scripts` directory as they use relative paths)
+1. Building
   - Building ipxe.iso image
     - Use new/existing iPXE config file in `deploy/build/ipxe/scripts`
     - Input its name as FILE variable in `deploy/scripts/build-ipxe-iso.sh`

compose.yaml

@@ -1,8 +1,18 @@
 services:
   controller:
-    build: ./internal/controller
-    ports:
-      - 8081:8080
+    build: ./internal/runner
+    # ports:
+    # - 8081:8080
+    volumes:
+      - ./deploy/ssh/key:/app/key:z
+      - ./deploy/ansible:/app/ansible:z
+    environment:
+      - LC_ALL=en_US.UTF-8
+      - USERNAME=Administrator
+      - PASSWORD=A0F7HKUU
+      - URL=https://192.168.0.230
+      - VALIDCERT=false
+      - WIPEINTERVAL=300
   apache:
     build: ./deploy/serve
     volumes:

deploy/ansible/playbook.yml

@@ -0,0 +1,13 @@
+---
+- name: Test
+  hosts: all
+  gather_facts: false
+
+  tasks:
+    - name: Install python
+      raw: test -e /usr/bin/python3 || apk add --no-cache python3
+
+    - name: Gather facts
+      setup:
+      vars:
+        ansible_python_interpreter: /usr/bin/python3

deploy/ansible/scripts/hello.sh

@@ -0,0 +1 @@
+echo "Running script!"

deploy/build/ipxe/Containerfile

@@ -16,4 +16,9 @@ WORKDIR /build
 RUN git clone https://github.com/ipxe/ipxe.git
 WORKDIR /build/ipxe/src
 
-CMD make -j${ISO_MAKE_THREADS} bin/ipxe.iso EMBED=/input/${FILE} && mv bin/ipxe.iso /output/ipxe.iso
+RUN sed -i 's$//#define PING_CMD$#define PING_CMD$g' config/general.h &&\
+    sed -i 's$//#define NET_PROTO_IPV6$#define NET_PROTO_IPV6$g' config/general.h &&\
+    sed -i 's/undef.*DOWNLOAD_PROTO_HTTPS/define DOWNLOAD_PROTO_HTTPS/g' config/general.h
+
+CMD make -j${ISO_MAKE_THREADS} bin/ipxe.iso EMBED=/input/${FILE} \
+    && mv bin/ipxe.iso /output/ipxe.iso

deploy/build/ipxe/scripts/alpinebooter.ipxe

@@ -1,27 +1,8 @@
 #!ipxe
 
-# The iPXE script below is based on:
-# https://boot.alpinelinux.org/boot.ipxe
+echo Setting temporary DHCP address to chain into bootfile
+dhcp
 
-ifopen
-ifstat
-set net0/ip:ipv4 192.168.0.231
-set net0/netmask:ipv4 255.255.255.0
-set net0/gateway:ipv4 192.168.0.1
-set net0/dns:ipv4 192.168.0.1
-ifopen net0
-
-set serverip 192.168.0.170
-
-set console console=tty0
-set cmdline modules=loop,squashfs nomodeset
-set branch v3.20
-set flavor lts
-set arch x86_64
-set img-url http://${serverip}/iso/alpine-netboot/boot
-set modloop-url ${img-url}/modloop-${flavor}
-
-imgfree
-kernel ${img-url}/vmlinuz-${flavor} ${cmdline} init=/sbin/init ${console} modloop=${modloop-url} ip=192.168.0.231
-initrd ${img-url}/initramfs-${flavor}
-boot
+set chain-url http://192.168.0.160:8080/bootfile
+echo Chaining to ${chain_url}
+chain ${chain-url}?uuid=${uuid}

deploy/build/ipxe/scripts/vm-test.ipxe

@@ -3,8 +3,6 @@
 # The iPXE script below is based on:
 # https://boot.alpinelinux.org/boot.ipxe
 
-#!ipxe
-
 dhcp
 
 set console console=tty0

deploy/scripts/build-alpine.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 
 PODMAN_IMAGE_NAME="alpine_builder"
 WWW_DIR="../serve/www/iso/alpine-netboot"
@@ -8,7 +9,7 @@ echo "--- Creating directory at ${WWW_DIR} ---"
 mkdir -p ${WWW_DIR}
 
 echo "--- Building ${PODMAN_IMAGE_NAME} ---"
-podman build --no-cache --tag ${PODMAN_IMAGE_NAME} ${BUILD_DIR}
+podman build --tag ${PODMAN_IMAGE_NAME} ${BUILD_DIR}
 
 echo "--- Running ${PODMAN_IMAGE_NAME} ---"
 podman run --rm -v ${WWW_DIR}:/output:z \

deploy/scripts/build-ipxe-iso.sh

@@ -1,30 +1,39 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 
-FILE="vm-test.ipxe"
+FILE="alpinebooter.ipxe"
 
 WWW_DIR="../serve/www"
 BUILD_DIR="../build/ipxe"
 PODMAN_IMAGE_NAME="ipxe_builder"
+SSH_KEY_DIR="../ssh"
 ISO_MAKE_THREADS=16
 
 echo "--- Creating serve directory at ${WWW_DIR} ---"
 mkdir -p ${WWW_DIR}
 
-echo "--- Generating new SSH key pair ---"
-ssh-keygen -t rsa -f ../build/key -N ""
+echo "--- Creating ssh key directory at ${SSH_KEY_DIR} ---"
+mkdir -p ${SSH_KEY_DIR}
+
+echo "--- Generating new SSH key pair in ${SSH_KEY_DIR} ---"
+ssh-keygen -t rsa -f ${SSH_KEY_DIR}/key -N ""
 
 echo "--- Copying public SSH key to ${WWW_DIR} ---"
 mkdir -p ${WWW_DIR}/ssh
-mv -f ../build/key.pub ${WWW_DIR}/ssh/key.pub
+mv -f ${SSH_KEY_DIR}/key.pub ${WWW_DIR}/ssh/key.pub
 
 echo "--- Setting correct permissions for private key ---"
-chmod 600 ../build/key
+chmod 600 ${SSH_KEY_DIR}/key
+
+# echo "--- Building ${PODMAN_IMAGE_NAME} ---"
+# podman build \
+#     --tag ${PODMAN_IMAGE_NAME} \
+#     ${BUILD_DIR}
 
-echo "--- Building ${PODMAN_IMAGE_NAME} ---"
-podman build \
-    --tag ${PODMAN_IMAGE_NAME} \
-    --no-cache \
-    ${BUILD_DIR}
+if [ $? -neq 0 ]; then
+  echo "!!! BUILD FAILED, EXITING !!!"
+  exit
+fi
 
 echo "--- Building ipxe.iso with ${FILE} embedded, writing to ${WWW_DIR} (using ${ISO_MAKE_THREADS} threads) ---"
 podman run \