ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug Fix: Terraform crashes during azurerm_container_service provisioning (#12516) 

* Corrected referencing on sshKeys map

* changed tests to use East US due to resource availability
This commit is contained in:
Brandon Tosch 2017-03-08 07:25:51 -08:00 committed by Paul Stack
parent 5d894e4ffd
commit c2a6625d0f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/azurerm/resource_arm_container_service.go
View File

@ -360,7 +360,7 @@ func flattenAzureRmContainerServiceLinuxProfile(profile containerservice.LinuxPr
}
values["admin_username"] = *profile.AdminUsername
values["ssh_key"] = &sshKeys
values["ssh_key"] = sshKeys
profiles.Add(values)
return profiles

8
builtin/providers/azurerm/resource_arm_container_service_test.go
View File

@ -154,7 +154,7 @@ func TestAccAzureRMContainerService_swarmBasic(t *testing.T) {
var testAccAzureRMContainerService_dcosBasic = `
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
location = "East US"
}
resource "azurerm_container_service" "test" {
@ -192,7 +192,7 @@ resource "azurerm_container_service" "test" {
var testAccAzureRMContainerService_kubernetesBasic = `
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
location = "East US"
}
resource "azurerm_container_service" "test" {
@ -235,7 +235,7 @@ resource "azurerm_container_service" "test" {
var testAccAzureRMContainerService_kubernetesComplete = `
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
location = "East US"
}
resource "azurerm_container_service" "test" {
@ -282,7 +282,7 @@ resource "azurerm_container_service" "test" {
var testAccAzureRMContainerService_swarmBasic = `
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
location = "East US"
}
resource "azurerm_container_service" "test" {