Merge pull request #224 from BrianLPeterson/user/bpet/scriptfix

MatthewMcGlynn · web-flow · commit 117a1c6826c7 · 2017-06-13T16:53:31.000-07:00
Fix for error in adding VMSS with multiple module versions
diff --git a/ComputeAdmin/AzureStack.ComputeAdmin.psm1 b/ComputeAdmin/AzureStack.ComputeAdmin.psm1
@@ -44,9 +44,8 @@ function Add-AzureStackVMSSGalleryItem {
     }
     
     $fileName = "microsoft.vmss.1.3.6.azpkg"
-    $basePath = (Get-Module AzureStack.ComputeAdmin).ModuleBase
 
-    $blob = Set-AzureStorageBlobContent –File ($basePath + "\" + $fileName) –Blob $fileName -Container $cName -Force
+    $blob = Set-AzureStorageBlobContent –File ($PSScriptRoot + "\" + $fileName) –Blob $fileName -Container $cName -Force
     $container = Get-AzureStorageContainer -Name $cName -ErrorAction SilentlyContinue
 
     $uri = $blob.Context.BlobEndPoint + $container.Name + "/" + $blob.Name    

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,8 @@ function Add-AzureStackVMSSGalleryItem {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$fileName = "microsoft.vmss.1.3.6.azpkg"`
`47`		`- $basePath = (Get-Module AzureStack.ComputeAdmin).ModuleBase`
`48`	`47`
`49`		`- $blob = Set-AzureStorageBlobContent –File ($basePath + "\" + $fileName) –Blob $fileName -Container $cName -Force`
	`48`	`+ $blob = Set-AzureStorageBlobContent –File ($PSScriptRoot + "\" + $fileName) –Blob $fileName -Container $cName -Force`
`50`	`49`	`$container = Get-AzureStorageContainer -Name $cName -ErrorAction SilentlyContinue`
`51`	`50`
`52`	`51`	`$uri = $blob.Context.BlobEndPoint + $container.Name + "/" + $blob.Name`