MrMeeb-Labs/core-infrastructure
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

install tools as part of base

Browse Source
This commit is contained in:
Charlie Macdonald
2026-05-30 20:51:44 +00:00
parent 903a4406c2
commit ee73cc3bcf
2 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ignition/base.bu
+21
View File
@@ -85,5 +85,26 @@ systemd:
ExecStart=/usr/bin/touch /var/lib/%N.stamp ExecStart=/usr/bin/touch /var/lib/%N.stamp
ExecStart=/usr/bin/systemctl --no-block reboot ExecStart=/usr/bin/systemctl --no-block reboot
[Install]
WantedBy=multi-user.target
# Install tools
- name: rpm-ostree-install-tools.service
enabled: true
contents: |
[Unit]
Description=Install tools
Wants=network-online.target
After=ignition-start-config.service
Before=zincati.service
ConditionPathExists=!/var/lib/%N.stamp
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/rpm-ostree install htop tmux
ExecStart=/usr/bin/touch /var/lib/%N.stamp
ExecStart=/usr/bin/systemctl --no-block reboot
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
ignition/base.ign
+54 -49
View File
@@ -1,49 +1,54 @@
{ {
"ignition": { "ignition": {
"version": "3.5.0" "version": "3.5.0"
}, },
"storage": { "storage": {
"files": [ "files": [
{ {
"path": "/etc/zincati/config.d/51-rollout-wariness.toml", "path": "/etc/zincati/config.d/51-rollout-wariness.toml",
"contents": { "contents": {
"compression": "", "compression": "",
"source": "data:,%5Bidentity%5D%0Arollout_wariness%20%3D%200.8%0A" "source": "data:,%5Bidentity%5D%0Arollout_wariness%20%3D%200.8%0A"
} }
}, },
{ {
"path": "/etc/zincati/config.d/55-updates-strategy.toml", "path": "/etc/zincati/config.d/55-updates-strategy.toml",
"contents": { "contents": {
"compression": "", "compression": "",
"source": "data:;base64,W3VwZGF0ZXNdCnN0cmF0ZWd5ID0gInBlcmlvZGljIgpbW3VwZGF0ZXMucGVyaW9kaWMud2luZG93XV0KZGF5cyA9IFsgIlNhdCIsIlN1biIgXQpzdGFydF90aW1lID0gIjA2OjAwIgpsZW5ndGhfbWludXRlcyA9IDYwCg==" "source": "data:;base64,W3VwZGF0ZXNdCnN0cmF0ZWd5ID0gInBlcmlvZGljIgpbW3VwZGF0ZXMucGVyaW9kaWMud2luZG93XV0KZGF5cyA9IFsgIlNhdCIsIlN1biIgXQpzdGFydF90aW1lID0gIjA2OjAwIgpsZW5ndGhfbWludXRlcyA9IDYwCg=="
} }
}, },
{ {
"path": "/etc/issue.d/35-ssh-blocked.issue", "path": "/etc/issue.d/35-ssh-blocked.issue",
"contents": { "contents": {
"compression": "", "compression": "",
"source": "data:,%0ASSH%20currently%20disabled%20until%20configuration%20completes%0A" "source": "data:,%0ASSH%20currently%20disabled%20until%20configuration%20completes%0A"
} }
} }
] ]
}, },
"systemd": { "systemd": {
"units": [ "units": [
{ {
"contents": "[Unit]\nDescription=Block SSH during configuration\nAfter=network-online.target\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl stop sshd\nExecStart=/usr/bin/systemctl disable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n", "contents": "[Unit]\nDescription=Block SSH during configuration\nAfter=network-online.target\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl stop sshd\nExecStart=/usr/bin/systemctl disable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n",
"enabled": true, "enabled": true,
"name": "ignition-start-config.service" "name": "ignition-start-config.service"
}, },
{ {
"contents": "[Unit]\nDescription=Enable SSH after configuration\nAfter=multi-user.target\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/systemctl start sshd\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl restart getty@tty1\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n", "contents": "[Unit]\nDescription=Enable SSH after configuration\nAfter=multi-user.target\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/systemctl start sshd\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl restart getty@tty1\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n",
"enabled": true, "enabled": true,
"name": "ignition-finish-config.service" "name": "ignition-finish-config.service"
}, },
{ {
"contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target", "contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target\n",
"enabled": true, "enabled": true,
"name": "rpm-ostree-install-qemu-guest-agent.service" "name": "rpm-ostree-install-qemu-guest-agent.service"
} },
] {
} "contents": "[Unit]\nDescription=Install tools\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install htop tmux\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target",
} "enabled": true,
"name": "rpm-ostree-install-tools.service"
}
]
}
}