Remove ssh legacy fix for Ubuntu Server 22.04 (#5645)

actions · Jun 1, 2022 · 36ddf74 · 36ddf74
1 parent 0fec5d8
commit 36ddf74
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/images.CI/linux-and-win/build-image.ps1 b/images.CI/linux-and-win/build-image.ps1
@@ -19,9 +19,6 @@ if (-not (Test-Path $TemplatePath))
     exit 1
 }
 
-# Set Image repository path env variable, this is a workaround for Ubuntu 22.04 until this is fixed https://github.com/hashicorp/packer/issues/11733
-$env:ImageRepositoryPath = "."
-
 $Image = [io.path]::GetFileName($TemplatePath).Split(".")[0]
 $TempResourceGroupName = "${ResourcesNamePrefix}_${Image}"
 $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()

diff --git a/images/linux/scripts/base/configure-legacy-ssh.sh b/images/linux/scripts/base/configure-legacy-ssh.sh
diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl
@@ -60,11 +60,6 @@ variable "image_os" {
   default = "ubuntu22"
 }
 
-variable "image_repository_path" {
-  type    = string
-  default = "${env("IMAGEREPOSITORYPATH")}"
-}
-
 variable "image_version" {
   type    = string
   default = "dev"
@@ -165,7 +160,6 @@ source "azure-arm" "build_vhd" {
   subscription_id                        = "${var.subscription_id}"
   temp_resource_group_name               = "${var.temp_resource_group_name}"
   tenant_id                              = "${var.tenant_id}"
-  user_data_file                         = "${var.image_repository_path}/images/linux/scripts/base/configure-legacy-ssh.sh"
   virtual_network_name                   = "${var.virtual_network_name}"
   virtual_network_resource_group_name    = "${var.virtual_network_resource_group_name}"
   virtual_network_subnet_name            = "${var.virtual_network_subnet_name}"