Update autoinstall format to

dappnode · Jun 14, 2024 · ee4c9fe · ee4c9fe
1 parent abe10d0
commit ee4c9fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/validate_autoinstall.yml b/.github/workflows/validate_autoinstall.yml
@@ -20,10 +20,10 @@ jobs:
         pip install check-jsonschema yamllint yq
 
     - name: Lint attended autoinstall.yaml
-      run: yamllint iso/preseeds/ubuntu/autoinstall.yaml
+      run: yamllint -c .yamllint iso/preseeds/ubuntu/autoinstall.yaml
 
     - name: Lint unattended autoinstall.yaml
-      run: yamllint iso/preseeds/ubuntu/autoinstall_unattended.yaml
+      run: yamllint -c .yamllint iso/preseeds/ubuntu/autoinstall_unattended.yaml
 
     - name: Download JSON schema
       run: curl -o schema.json https://raw.githubusercontent.com/canonical/subiquity/main/autoinstall-schema.json

diff --git a/.yamllint b/.yamllint
@@ -0,0 +1,6 @@
+# .yamllint
+extends: default
+
+rules:
+  line-length:
+    max: 150
diff --git a/iso/preseeds/ubuntu/autoinstall.yaml b/iso/preseeds/ubuntu/autoinstall.yaml
@@ -1,4 +1,5 @@
-#cloud-config
+# cloud-config
+---
 autoinstall:
   version: 1
   interactive-sections:
@@ -26,5 +27,5 @@ autoinstall:
     - "cp -a /cdrom/dappnode/scripts/rc.local /target/etc/rc.local"
     - "chmod +x /target/usr/src/dappnode/scripts/dappnode_install_pre.sh"
     - "touch /target/usr/src/dappnode/.firstboot"
-    - "cp -ar /etc/netplan/* /target/etc/netplan/" # Necessary for prerequisites
+    - "cp -ar /etc/netplan/* /target/etc/netplan/"  # Necessary for prerequisites
     - "curtin in-target --target=/target -- /usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE"
diff --git a/iso/preseeds/ubuntu/autoinstall_unattended.yaml b/iso/preseeds/ubuntu/autoinstall_unattended.yaml
@@ -1,4 +1,5 @@
-#cloud-config
+# cloud-config
+---
 autoinstall:
   version: 1
 
@@ -28,6 +29,7 @@ autoinstall:
     - intel-microcode
     - iucode-tool
     - iptables
+
   timezone: UTC
 
   late-commands:
@@ -37,6 +39,6 @@ autoinstall:
     - "cp -a /cdrom/dappnode/scripts/rc.local /target/etc/rc.local"
     - "chmod +x /target/usr/src/dappnode/scripts/dappnode_install_pre.sh"
     - "touch /target/usr/src/dappnode/.firstboot"
-    - "cp -ar /etc/netplan/* /target/etc/netplan/" # Necessary for prerequisites
+    - "cp -ar /etc/netplan/* /target/etc/netplan/"  # Necessary for prerequisites
     - "curtin in-target --target=/target -- /usr/src/dappnode/scripts/dappnode_install_pre.sh UPDATE"
-# TODO: Handle /etc/network/interfaces and /etc/network/devhotplug
+    # TODO: Handle /etc/network/interfaces and /etc/network/devhotplug