Repository navigation
Conversation
Move the Nix install, playbook run, Nix GC and report steps that qemu-bootstrap-nix.sh and nix-provision.sh duplicated into provision-common.sh. Both Packer builds upload it to /tmp. Refs: MPG-1383 Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Package version diff: none (aarch64-linux, x86_64-linux) |
Move locale, postgres env, sshd password auth and the image cleanup tail into provision-common.sh. The AMI chroot scripts get the library copied into /mnt/tmp. Refs: MPG-1383 Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Share the image log setup between both builds. The AMI now ships /var/log/wal-g as 0310 and pitr.log as 0340, matching QEMU and the salt vector formula, so vector can read pitr.log without salt. Refs: MPG-1383 Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the steps that the QEMU and AMI builds duplicated into
ebssurrogate/scripts/provision-common.sh. Both Packer builds upload it to/tmp/provision-common.shand source it. The AMI chroot scripts get a copy in/mnt/tmp.Shared:
Target-specific steps stay in each script, including the package purge lists.
Behavior changes
/var/log/wal-gand its files go from0300to0310, andpitr.logis0340. QEMU already used these values. The salt vector formula enforces them on v2 hosts so vector can readpitr.log. The image now carries them for hosts without salt.--extra-varsJSON loses its inner space. The arguments are otherwise the same.Testing
Checked with stubbed
ansible-playbookand stubbed cleanup commands: the command streams match the old scripts apart from the changes above. No image was built.🤖 Generated with Claude Code
MPG-1383