Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions src/Compute/Compute.Test/ScenarioTests/ImageTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,7 @@ function Test-DefaultImagesExistManual

# Linux
# UbuntuLTS test
$publisher = $images.Linux.UbuntuLTS.publisher;
$offer = $images.Linux.UbuntuLTS.offer;
$sku = $images.Linux.UbuntuLTS.sku;
$version = $images.Linux.UbuntuLTS.version;
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image UbuntuLTS;


# Ubuntu2204 test
$publisher = $images.Linux.Ubuntu2204.publisher;
$offer = $images.Linux.Ubuntu2204.offer;
Expand All @@ -355,15 +348,6 @@ function Test-DefaultImagesExistManual
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Ubuntu2204;

# CentOS test
$publisher = $images.Linux.CentOS.publisher;
$offer = $images.Linux.CentOS.offer;
$sku = $images.Linux.CentOS.sku;
$version = $images.Linux.CentOS.version;
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS;

# CentOS versioned test
$publisher = $images.Linux.CentOS85Gen2.publisher;
$offer = $images.Linux.CentOS85Gen2.offer;
Expand All @@ -373,15 +357,6 @@ function Test-DefaultImagesExistManual
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image CentOS85Gen2;

# Debian test
$publisher = $images.Linux.Debian.publisher;
$offer = $images.Linux.Debian.offer;
$sku = $images.Linux.Debian.sku;
$version = $images.Linux.Debian.version;
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image Debian;

# Debian versioned test
$publisher = $images.Linux.Debian11.publisher;
$offer = $images.Linux.Debian11.offer;
Expand All @@ -399,16 +374,7 @@ function Test-DefaultImagesExistManual
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image OpenSuseLeap154Gen2;

# RHEL test
$publisher = $images.Linux.RHEL.publisher;
$offer = $images.Linux.RHEL.offer;
$sku = $images.Linux.RHEL.sku;
$version = $images.Linux.RHEL.version;
$img = Get-AzVMImage -Location $loc -Publisher $publisher -Offer $offer -Sku $sku -Version $version;
Assert-NotNull $img;
New-AzVM -ResourceGroupName MyResourceGroup -Name mytestvm -Location $loc -Credential $cred -DomainNameLabel $domainNameLabel -Image RHEL;


# RHELRaw8LVMGen2 test
$publisher = $images.Linux.RHELRaw8LVMGen2.publisher;
$offer = $images.Linux.RHELRaw8LVMGen2.offer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@ function Test-SimpleNewVmWithDefaultDomainName2
-ResourceGroupName $rgname `
-Name $vmname `
-Credential $cred `
-ImageName "ubuntults"
-ImageName "ubuntu2204"

# second VM
$x2 = New-AzVM `
-ResourceGroupName $rgname2 `
-Name $vmname `
-Credential $cred `
-ImageName "ubuntults"
-ImageName "ubuntu2204"
}
finally
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5262,7 +5262,7 @@ function Test-VMwithSSHKey
$vmname = '1' + $rgname;
$domainNameLabel = "d1" + $rgname;
$sshKeyName = "s" + $rgname
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image CentOS -DomainNameLabel $domainNameLabel -SshKeyname $sshKeyName -generateSshkey
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image CentOS85Gen2 -DomainNameLabel $domainNameLabel -SshKeyname $sshKeyName -generateSshkey

$vm = Get-AzVm -ResourceGroupName $rgname -Name $vmname
$sshKey = Get-AzSshKey -ResourceGroupName $rgname -Name $sshKeyName
Expand Down

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Compute/Compute/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
-->
## Upcoming Release
* Added update functionality in `Update-AzVmss` for parameters `SecurityType`, `EnableSecureBoot`, and `EnableVtpm` for the parameter set with the Put operation.
* [Breaking change] Removed unversioned and outdated linux image aliases of `CentOS`, `RHEL`, `UbuntuLTS` and `Debian`.

## Version 6.3.0
* Added `-Hibernate` switch parameter to `Stop-AzVmss` default parameter set.
Expand Down
24 changes: 0 additions & 24 deletions src/Compute/Compute/Strategies/ComputeRp/Images.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
{
"Linux": {
"CentOS": {
"publisher": "OpenLogic",
"offer": "CentOS",
"sku": "7.5",
"version": "latest"
},
"CentOS85Gen2": {
"publisher": "OpenLogic",
"offer": "CentOS",
"sku": "8_5-gen2",
"version": "latest"
},
"Debian": {
"publisher": "credativ",
"offer": "Debian",
"sku": "8",
"version": "latest"
},
"Debian11": {
"publisher": "Debian",
"offer": "debian-11",
Expand All @@ -30,12 +18,6 @@
"sku": "gen2",
"version": "latest"
},
"RHEL": {
"publisher": "RedHat",
"offer": "RHEL",
"sku": "7-RAW",
"version": "latest"
},
"RHELRaw8LVMGen2": {
"publisher": "RedHat",
"offer": "RHEL",
Expand All @@ -48,12 +30,6 @@
"sku": "gen2",
"version": "latest"
},
"UbuntuLTS": {
"publisher": "Canonical",
"offer": "UbuntuServer",
"sku": "16.04-LTS",
"version": "latest"
},
"Ubuntu2204": {
"publisher": "Canonical",
"offer": "0001-com-ubuntu-server-jammy",
Expand Down
40 changes: 22 additions & 18 deletions src/Compute/Compute/help/New-AzVM.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ This command creates a VM from a marketplace image without a Public IP.

### Example 4: Create a VM with a UserData value:
```powershell
## VM Account
# VM Account
$VMLocalAdminUser = "LocalAdminUser";
$VMLocalAdminSecurePassword = ConvertTo-SecureString "Password" -AsPlainText -Force;

## Azure Account
# Azure Account
$LocationName = "eastus";
$ResourceGroupName = "MyResourceGroup";

Expand All @@ -209,7 +209,7 @@ $bytes = [System.Text.Encoding]::Unicode.GetBytes($text);
$userData = [Convert]::ToBase64String($bytes);

# Create VM
New-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -Credential $cred -DomainNameLabel $domainNameLabel -UserData $userData;
New-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -Credential $Credential -DomainNameLabel $domainNameLabel -UserData $userData;
$vm = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $VMName -UserData;
```

Expand All @@ -236,19 +236,23 @@ This example deploys a Windows VM from the marketplace in one resource group wit

### Example 6: Creating a new VM as part of a VMSS with a PlatformFaultDomain value.
```powershell
$resourceGroupName= "Resource Group Name"
$domainNameLabel = "Domain Name Label Name"
$vmname = "Virtual Machine Name"
$platformFaultDomainVMDefaultSet = 2
$securePassword = "Password" | ConvertTo-SecureString -AsPlainText -Force
$user = "Username"
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword)
$vmssName = "Vmss Name";
$resourceGroupName= "ResourceGroupName";
$loc = 'eastus';
New-AzResourceGroup -Name $resourceGroupName -Location $loc -Force;

$domainNameLabel = "d1" + $resourceGroupName;
$vmname = "vm" + $resourceGroupName;
$platformFaultDomainVMDefaultSet = 2;
$vmssFaultDomain = 3;
$securePassword = <PASSWORD> | ConvertTo-SecureString -AsPlainText -Force;
$user = <USERNAME>;
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
$vmssName = "vmss" + $resourceGroupName;

$vmssConfig = New-AzVmssConfig -Location $loc -PlatformFaultDomainCount $vmssFaultDomain;
$vmss = New-AzVmss -ResourceGroupName $resourceGroupName -Name $vmssName -VirtualMachineScaleSet $vmssConfig;

$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -PlatformFaultDomain $platformFaultDomainVMDefaultSet -VmssId $vmss.Id
$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -DomainNameLabel $domainNameLabel -PlatformFaultDomain $platformFaultDomainVMDefaultSet -VmssId $vmss.Id;
```

This example creates a new VM as part of a VMSS with a PlatformFaultDomain value.
Expand Down Expand Up @@ -329,14 +333,14 @@ $securePassword = "<Password>" | ConvertTo-SecureString -AsPlainText -Force
$user = "<Username>"
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword)

New-AzResourceGroup -Name $rgname -Location $loc -Force
New-AzResourceGroup -Name $resourceGroupName -Location $loc -Force

# Create a VM using an Image alias.
$vmname = 'v' + $rgname
$domainNameLabel = "d" + $rgname
$vm = New-AzVM -ResourceGroupName $rgname -Name $vmname -Credential $cred -Image OpenSuseLeap154Gen2 -DomainNameLabel $domainNameLabel
$vmname = 'v' + $resourceGroupName
$domainNameLabel = "d" + $resourceGroupName
$vm = New-AzVM -ResourceGroupName $resourceGroupName -Name $vmname -Credential $cred -Image OpenSuseLeap154Gen2 -DomainNameLabel $domainNameLabel

$vm = Get-AzVM -ResourceGroupName $rgname -Name $vmname
$vm = Get-AzVM -ResourceGroupName $resourceGroupName -Name $vmname
```

This example creates a new VM using the -Image parameter, providing many default values to the VM.
Expand Down Expand Up @@ -757,7 +761,7 @@ Accept wildcard characters: False
```

### -Image
The friendly image name upon which the VM will be built. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS, CentOS85Gen2, Debian, Debian11, OpenSuseLeap154Gen2, RHEL, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
The friendly image name upon which the VM will be built. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, Ubuntu2204, CentOS85Gen2, Debian11, OpenSuseLeap154Gen2, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.

```yaml
Type: System.String
Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/help/New-AzVmss.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ $subnetId = $vnet.Subnets[0].Id;
$vmssName = 'vmss' + $rgname;
$vmssType = 'Microsoft.Compute/virtualMachineScaleSets';
$adminUsername = <USER NAME>;
$adminPassword = <PASSWORD> | ConvertTo-SecureString -AsPlainText -Force;
$adminPassword = <PASSWORD>;
$imgRef = New-Object -TypeName 'Microsoft.Azure.Commands.Compute.Models.PSVirtualMachineImage';
$imgRef.PublisherName = $PublisherName;
$imgRef.Offer = $Offer;
Expand Down Expand Up @@ -578,7 +578,7 @@ Accept wildcard characters: False
```

### -ImageName
The alias of the image for VMs in this Scale Set. If no value is provided, the "Windows Server 2016 DataCenter" image will be used. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS, CentOS85Gen2, Debian, Debian11, OpenSuseLeap154Gen2, RHEL, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.
The alias of the image for VMs in this Scale Set. If no value is provided, the "Windows Server 2016 DataCenter" image will be used. The available aliases are: Win2022AzureEditionCore, Win2019Datacenter, Win2016Datacenter, Win2012R2Datacenter, Win2012Datacenter, UbuntuLTS, Ubuntu2204, CentOS85Gen2, Debian11, OpenSuseLeap154Gen2, RHELRaw8LVMGen2, SuseSles15SP3, FlatcarLinuxFreeGen2.

```yaml
Type: System.String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function createAzureVm{
$domain = "domain"+ $seed
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain
return $vm.Id
}

Expand All @@ -217,7 +217,7 @@ function createAzureVmInProximityPlacementgroup{
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
$ppg = New-AzProximityPlacementGroup -ResourceGroupName $vmName -Name $VMName -Location $VMLocation
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -ProximityPlacementGroupId $ppg.Id
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -ProximityPlacementGroupId $ppg.Id
return $vm.Id
}

Expand All @@ -233,7 +233,7 @@ function createAzureVmForCRG{
$domain = "domain"+ $seed
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -Size "Standard_Ds1_v2"
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -Size "Standard_Ds1_v2"
return $vm.Id
}

Expand All @@ -251,7 +251,7 @@ function createAzureVmInAvailabilityZone{
$domain = "domain"+ $seed
$password=$VMLocalAdminSecurePassword|ConvertTo-SecureString -AsPlainText -Force
$Credential = New-Object System.Management.Automation.PSCredential ($VMLocalAdminUser, $password);
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHEL -DomainNameLabel $domain -Zone $VMZone
$vm = New-AzVM -Name $VMName -Credential $Credential -location $VMLocation -Image RHELRaw8LVMGen2 -DomainNameLabel $domain -Zone $VMZone
return $vm.Id
}

Expand Down