Skip to content

Commit

Permalink
Added VmOs Provider and Name to allow using ubuntu 20.04 (#272)
Browse files Browse the repository at this point in the history
Co-authored-by: Blair L Murri <BMurri@users.noreply.github.com>
  • Loading branch information
saulobejo and BMurri committed Nov 2, 2021
1 parent f102c9b commit 31e45e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/troubleshooting-guide.md
Expand Up @@ -215,6 +215,8 @@ Configuration parameter | Has default | Validated | Used by update | Comment
string SubscriptionId | N | Y | Y | Azure Subscription Id - Always required
string RegionName | N | Y | N | Azure region name to deploy to - Required for new install
string MainIdentifierPrefix = "coa" | Y | Y | N | Prefix for all resources to be deployed - Required to deploy but defaults to "coa"
string VmOsProvider = "Canonical" | Y | N | N | OS Provider VM to use as the host - Not required and defaults to Ubuntu
string VmOsName = "UbuntuServer" | Y | N | N | OS Name of the VM to use as the host - Not required and defaults to UbuntuServer
string VmOsVersion = "18.04-LTS" | Y | N | N | OS Version of the Linux Ubuntu VM to use as the host - Not required and defaults to Ubuntu 18.04 LTS
string VmSize = "Standard_D3_v2" | Y | N | N | VM size of the Linux Ubuntu VM to use as the host - Not required and defaults to [Standard_D3_v2](https://docs.microsoft.com/en-us/azure/cloud-services/cloud-services-sizes-specs#dv2-series)
string VmUsername = "vmadmin"; | Y | N | Y | Username created on Cromwell on Azure Linux host - Not required and defaults to "vmadmin"
Expand Down
2 changes: 2 additions & 0 deletions src/deploy-cromwell-on-azure/Configuration.cs
Expand Up @@ -14,6 +14,8 @@ public class Configuration
public string SubscriptionId { get; set; }
public string RegionName { get; set; }
public string MainIdentifierPrefix { get; set; } = "coa";
public string VmOsProvider { get; set; } = "Canonical";
public string VmOsName { get; set; } = "UbuntuServer";
public string VmOsVersion { get; set; } = "18.04-LTS";
public string VmSize { get; set; } = "Standard_D3_v2";
public string VnetAddressSpace { get; set; } = "10.0.0.0/24";
Expand Down
2 changes: 1 addition & 1 deletion src/deploy-cromwell-on-azure/Deployer.cs
Expand Up @@ -1078,7 +1078,7 @@ private Task<IVirtualMachine> CreateVirtualMachineAsync(IIdentity managedIdentit
.WithPrimaryPrivateIPAddressDynamic();

var vmDefinitionPart2 = (configuration.PrivateNetworking.GetValueOrDefault() ? vmDefinitionPart1.WithoutPrimaryPublicIPAddress() : vmDefinitionPart1.WithNewPrimaryPublicIPAddress(configuration.VmName))
.WithLatestLinuxImage("Canonical", "UbuntuServer", configuration.VmOsVersion)
.WithLatestLinuxImage(configuration.VmOsProvider, configuration.VmOsName, configuration.VmOsVersion)
.WithRootUsername(configuration.VmUsername)
.WithRootPassword(configuration.VmPassword)
.WithNewDataDisk(dataDiskSizeGiB, dataDiskLun, CachingTypes.None)
Expand Down

0 comments on commit 31e45e5

Please sign in to comment.