Add cloud-init capability for Ubuntu

.gitignore

@@ -0,0 +1,2 @@
+out/*
+env

Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:22.04
+
+#Get dependencies
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC  apt update && apt-get -y install tzdata
+ENV LIBGUESTFS_BACKEND=direct
+
+WORKDIR /tmp
+RUN apt-get install --no-install-recommends --no-install-suggests -y libguestfs-tools qemu-utils linux-image-generic wget unzip zip
+# RUN git clone https://github.com/cl0-de/riasc-provisioning.git -b development
+ENV FLAVOR=raspios
+ENV REPOFOLDER=/tmp
+# ENV LIBGUESTFS_DEBUG=1 
+# ENV LIBGUESTFS_TRACE=1
+# RUN ./riasc-provisioning/rpi/create_image.sh
+
+CMD ${REPOFOLDER}/riasc/rpi/create_image.sh

README.md

@@ -1,30 +1,88 @@
-# RIasC Provisioning Scripts
+# Raspberry PI Image generation
 
-[![GitHub](https://img.shields.io/github/license/ERIGrid2/riasc-provisioning)](https://github.com/ERIGrid2/riasc-provisioning/blob/master/LICENSE)
+This project generates and customizes a Raspberry Pi image, either for Ubuntu or Raspberry Pi OS. The script is build for running within a docker container.
+
+The customizations include:
+* Generating or adding a `vaultkey.secret` file
+* Updating Ansible configuration in `/boot/firmware/riasc.yaml`
+* Updating cloud-init file in `/boot/firmware/user-data`
+* Setting GIT Ansible repor in `/boot/firmware/riasc.yaml`
+* Adding and enabling GIT based Ansible updates on reboot
 
-- **Based on:** <https://github.com/k3s-io/k3s-ansible>
 
-## Introduction
+## Usage
 
+1) Switch to direcory with Dockerfile to build image
+```
+docker build --tag "imagebuilder" .
+```
+2) Create `env` file:
+```
+GIT_URL=https://mygiturl
+FLAVOR=ubuntu22.04
+GIT_BRANCH=mybranch
+NODENAME=myhost
+TAG=test
+```
+3) Run docker container to generate image
+```
+docker run \
+--volume ./:/tmp/riasc \
+--volume ./out/:/tmp/data \
+--env-file ./env \
+imagebuilder
+```
+4) Image is placed in ´out/output´ folder
+5) Copy image to SD card. Either using dd or the Raspberry Pi Imiger
 
-## Documentation
 
-For further documentation, please consult: https://riasc.eu/docs/
+## List of available variables
+| Variable | Info |
+| - | - |
+|GIT_URL | URL to ansible git repository|
+|FLAVOR | Falvor of os. See list of flavors|
+|GIT_BRANCH | Branch used in ansible git pull|
+|NODENAME | The hostname of the device|
+|TAG | A tag that is added to the name|
+|RAW_OUTPOUT | Set to yes to get the .img file as output|
+|TOKEN | A token used by Ansible|
+|VAULT_KEY | Key to use in the vaultkey.secret file|
 
-## System requirements
+### List of flavors
 
-The scripts have been tested with the following operating systems:
+ubuntu24.04
 
-- Ubuntu 20.03
-- Raspbian Buster
+ubuntu22.04
 
-## Usage
+ubuntu20.04
+
+raspios
+
+
+# Help
+
+## How to mount the generated image to check the content?
+
+Check for the partitions in the image file:
+
+`fdisk -lu ubuntu-22.04.4-preinstalled-server-arm64+raspi.img`
+
+Run mount command. Make sure to update the offset (526336) for the correct value
+
+`mount ubuntu-22.04.4-preinstalled-server-arm64+raspi.img -o loop,offset=$(( 512 * 526336)) /mnt/`
+
+## How to add my custom secrets file for ansible vaults?
+
+To use a custom secret the VAULT_KEY variable can be set. If a vaultkey file of the name NODENAME-vaultkey.secret already exists the variable will be ignored.
+
+[![GitHub](https://img.shields.io/github/license/ERIGrid2/riasc-provisioning)](https://github.com/ERIGrid2/riasc-provisioning/blob/master/LICENSE)
 
-See: https://riasc.eu/docs/setup/agent/manual
 
 ## Credits
 
 - [Steffen Vogel](https://github.com/stv0g) [📧](mailto:post@steffenvogel.de), [Institute for Automation of Complex Power Systems](https://www.acs.eonerc.rwth-aachen.de), [RWTH Aachen University](https://www.rwth-aachen.de)
+- [Vincent Bareiß]() [📧](mailto:), [Institute for Automation of Complex Power Systems](https://www.acs.eonerc.rwth-aachen.de), [RWTH Aachen University](https://www.rwth-aachen.de)
+- [Manuel Pitz](https://https://github.com/windrad6) [📧](mailto:post@cl0.de), [Institute for Automation of Complex Power Systems](https://www.acs.eonerc.rwth-aachen.de), [RWTH Aachen University](https://www.rwth-aachen.de)
 
 ### Funding acknowledment
 

common/riasc-update.sh

@@ -150,11 +150,19 @@ ANSIBLE_EXTRA_VARS="$(config --tojson --indent 0 .ansible.variables)"
 ANSIBLE_OPTS=" --url $(config .ansible.url)"
 ANSIBLE_OPTS+=" --inventory $(config .ansible.inventory)"
 ANSIBLE_OPTS+=" $(config '.ansible.extra_args // [ ] | join(" ")')"
+if [ -f /boot/firmware/vaultkey.secret ]; then
+    ANSIBLE_OPTS+=" --vault-password-file /boot/firmware/vaultkey.secret"
+fi
+
 
 if [ $(config '.ansible.verify_commit') == "true" ]; then
 	ANSIBLE_OPTS+="--verify-commit"
 fi
 
+if ! [ $(config '.ansible.branch') = null ]; then
+	ANSIBLE_OPTS+=" --checkout $(config '.ansible.branch')"
+fi
+
 # Run Ansible playbook
 log "Running Ansible playbook..."
 ANSIBLE_FORCE_COLOR=1 \

common/riasc.ubuntu.yaml

@@ -0,0 +1,40 @@
+---
+# RIasC configuration file
+# See also: https://erigrid2.github.io/riasc/docs/setup/config
+
+# A unique hostname to identify the node
+hostname: dummyHostname
+
+ansible:
+  # List of PGP keys which are used to verify the commits in the Ansible repo
+  keys: []
+
+  keyserver: keys.openpgp.org
+
+  # A repository containing ansible playbooks which will be fetched via ansible-pull
+  url: dummyGitUrl
+
+  verify_commit: false
+
+  # The playbook which should be provision the node
+  playbook: playbook.yml
+
+  # A path to the Ansible inventory within the repo from above
+  inventory: inventory/edgeflex/hosts.yml
+
+  # extra_args:
+  # - --only-if-changed
+
+  # Additional variables which are passed to the Ansible playbook for provisioning
+  variables:
+
+  # A list of SSH keys which will be added to the 'pi' user
+  #additional_ssh_keys:
+  #- "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOmn+2RUo3XrHmm7h3w647+f6DlV5wXzBJSYLa7NBVlEasBd6Gxp4HDh1iKmNgZrneqXWOAH19P41k1qiwAx8/gUYDlnoah30RWp3qlXXIN+RUCUyUx34tatGTSDynuAyYKAOg0CawK066pSaRsMan2JdhL+r0YAKDXswMU8NVdc32AFTJLrZyGzlrFn4y7hSgHCtOy2RvoULWcjVtcF0GLuSr3WCLUwm1Qy83tft++5FJCcNtg986or5OOeWtZxFU035Q+2Khd2JqyweFTmCMRXEXAzUMv6Lqxuw19qpK4eOOU59oybXlga5yLFZY0CVBK8XVVnA0pkCnabQPHvVJWL7tcDVvzfnd0JdHpQ6oMsYFM7MdncKbHay5/g/tUz34WXPPAPWvciyLkI1NMV++JpaPeMEkAvrsUUZMko+4EQ75ZErUOY3PAJG+2Jilb79QTRMzpCVWfQ0A/Zx1O7Y0sLks+f5VDJaPnHl0vXetFIkEpv9XjomNZgp81m3XRItJh0+BwGqoYtc+MTLelAu0oap1LyHSbpBWGzKxi2tW9VOrX7/pI18f0AhhCc/BG/6UFjMhyYzGj9wg6HWAo1N8hlhdeuNic004hbADX7qzXJMyVEol5AL0rpu3j3j5zTeULY3HxiE+FC6yKg1DKvcxHkmwXoWJYwW9yAgYDyjhbw==" # Manuel Pitz
+  # Set this to true if you want to login via SSH keys only.
+  # If you dont have an SSH key, set this to false.
+  # Important: Dont forget to change the default password after your first login!
+  disable_password_login: false
+
+  # Replace this token with the token provided by your RIasC provider
+  token: XXXXX # changeme!

common/villas_docker.yaml

@@ -0,0 +1,3 @@
+hostname: villas-box
+
+ansible:

rpi/.gitignore

@@ -5,3 +5,4 @@ patch.fish
 riasc.yaml
 fallback-ntp.conf
 keys/
+edgepmu*/