Skip to content

Commit

Permalink
data/azure: fix resources for 1.36 provider
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinavdahiya committed Oct 3, 2019
1 parent 8bc6206 commit 27cd1fb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 0 additions & 2 deletions data/data/azure/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ data "azurerm_storage_account_sas" "ignition" {
}

resource "azurerm_storage_container" "ignition" {
resource_group_name = var.resource_group_name
name = "ignition"
storage_account_name = var.storage_account.name
container_access_type = "private"
Expand All @@ -49,7 +48,6 @@ resource "local_file" "ignition_bootstrap" {
resource "azurerm_storage_blob" "ignition" {
name = "bootstrap.ign"
source = local_file.ignition_bootstrap.filename
resource_group_name = var.resource_group_name
storage_account_name = var.storage_account.name
storage_container_name = azurerm_storage_container.ignition.name
type = "block"
Expand Down
5 changes: 1 addition & 4 deletions data/data/azure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,16 @@ resource "azurerm_virtual_network" "cluster_vnet" {
# copy over the vhd to cluster resource group and create an image using that
resource "azurerm_storage_container" "vhd" {
name = "vhd"
resource_group_name = azurerm_resource_group.main.name
storage_account_name = azurerm_storage_account.cluster.name
}

resource "azurerm_storage_blob" "rhcos_image" {
name = "rhcos${random_string.storage_suffix.result}.vhd"
resource_group_name = azurerm_resource_group.main.name
storage_account_name = azurerm_storage_account.cluster.name
storage_container_name = azurerm_storage_container.vhd.name
type = "block"
source_uri = var.azure_image_url
metadata = map("source_uri", "var.azure_image_url")
attempts = 2
metadata = map("source_uri", var.azure_image_url)
}

resource "azurerm_image" "cluster" {
Expand Down

0 comments on commit 27cd1fb

Please sign in to comment.