JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtualization/azure: fixes

Browse Source 
azure-agent: add option for verbose logging
azure-agent: disable ssh host key regeneration
azure-common: set verbose logging on
azure-image: increase size to 30GB
This commit is contained in:
Cole Mickens 2016-03-10 23:15:52 -08:00 committed by Evgeny Egorochkin
parent c6834ab527
commit 73487f4619
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/virtualisation/azure-agent.nix
View File

@ -54,9 +54,15 @@ in
###### interface ###### interface
options.virtualisation.azure.agent.enable = mkOption { options.virtualisation.azure.agent = {
default = false; enable = mkOption {
description = "Whether to enable the Windows Azure Linux Agent."; default = false;
description = "Whether to enable the Windows Azure Linux Agent.";
};
verboseLogging = mkOption {
default = false;
description = "Whether to enable verbose logging.";
};
}; };
###### implementation ###### implementation
@ -88,7 +94,7 @@ in
Provisioning.DeleteRootPassword=n Provisioning.DeleteRootPassword=n
# Generate fresh host key pair. # Generate fresh host key pair.
Provisioning.RegenerateSshHostKeyPair=y Provisioning.RegenerateSshHostKeyPair=n
# Supported values are "rsa", "dsa" and "ecdsa". # Supported values are "rsa", "dsa" and "ecdsa".
Provisioning.SshHostKeyPairType=ed25519 Provisioning.SshHostKeyPairType=ed25519
@ -121,7 +127,7 @@ in
Logs.Console=y Logs.Console=y
# Enable verbose logging (y|n) # Enable verbose logging (y|n)
Logs.Verbose=n Logs.Verbose=${if cfg.verboseLogging then "y" else "n"}
# Root device timeout in seconds. # Root device timeout in seconds.
OS.RootDeviceScsiTimeout=300 OS.RootDeviceScsiTimeout=300

1
nixos/modules/virtualisation/azure-common.nix
View File

@ -6,6 +6,7 @@ with lib;
require = [ ./azure-agent.nix ]; require = [ ./azure-agent.nix ];
virtualisation.azure.agent.enable = true; virtualisation.azure.agent.enable = true;
virtualisation.azure.agent.verboseLogging = true;
boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ];
boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ];

2
nixos/modules/virtualisation/azure-image.nix
View File

@ -2,7 +2,7 @@
with lib; with lib;
let let
diskSize = "4096"; diskSize = "30720";
in in
{ {
system.build.azureImage = system.build.azureImage =