Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

waagent: enable provisioning #266381

Merged
merged 2 commits into from
Nov 14, 2023
Merged

waagent: enable provisioning #266381

merged 2 commits into from
Nov 14, 2023

Conversation

Atry
Copy link
Contributor

@Atry Atry commented Nov 9, 2023

Description of changes

Currently there are two issues in Azure provisioning:

  1. Provisioning in waagent was disabled in waagent: update to 2.8.0.11 #206974 because provisioning always failed.
  2. Azure VM will timeout after 90 seconds when mounting /dev/sr0 during restarting an Azure VM, because /dev/sr0 is only available the first time starting an Azure VM.

This PR fixes provisioning in waagent and enables it.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: documentation 8.has: changelog labels Nov 9, 2023
@Atry
Copy link
Contributor Author

Atry commented Nov 9, 2023

Note that the code to read CustomData.bin is obsoleted. Nowadays there is not such file at all.

@Atry Atry marked this pull request as ready for review November 9, 2023 03:24
@Atry
Copy link
Contributor Author

Atry commented Nov 9, 2023

Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but I don't have a machine to test it right now.

Going forwards, please limit the number of people you request for review, so it's proportionate to the amount of code you change.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 10, 2023
@Atry
Copy link
Contributor Author

Atry commented Nov 11, 2023

Looks good, but I don't have a machine to test it right now.

I am using this PR to build images, which work well on Azure

@Mic92
Copy link
Member

Mic92 commented Nov 11, 2023

Can one of you test this by chance? @henrirosten @AkechiShiro
I don't have an Azure subscription and the last time I did, it screwed up my microsoft account.

@AkechiShiro
Copy link
Contributor

AkechiShiro commented Nov 11, 2023

Hi @Mic92 @Atry how can this be tested on Azure, an NixOS image must be built and uploaded to Azure and then booted as a VM ?

@Atry
Copy link
Contributor Author

Atry commented Nov 11, 2023

@AkechiShiro

  1. I use https://github.com/nix-community/nixos-generators to create the vhd file
  2. Then I uploaded the vhd file to Azure Blob Storage
  3. Then I created a VM Image from the vhd on the Azure Blob Storage
  4. Then I created a VM from the VM image

@Atry
Copy link
Contributor Author

Atry commented Nov 14, 2023

@AkechiShiro @Mic92 Any updates?

If you don't have time to manually test it on Azure, do you trust me enough to merge this PR, given that it works for me.

@Mic92 Mic92 merged commit a9b36a5 into NixOS:master Nov 14, 2023
25 checks passed
@Atry Atry deleted the waagent-provisioning branch November 14, 2023 18:47
@AkechiShiro
Copy link
Contributor

Hi @Atry, I'm sorry but I couldn't easily test it, I'd need a temporary throwaway account (it's a bit of a pain to setup just for testing this PR)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants