Skip to content

Commit

Permalink
revert cloudflare provider to 3.6.0 to keep credentials optional
Browse files Browse the repository at this point in the history
  • Loading branch information
displague committed Apr 27, 2023
1 parent d71a97b commit 784e20b
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 68 deletions.
130 changes: 68 additions & 62 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions modules/bastion/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ resource "null_resource" "ocp_install_ignition" {

resource "null_resource" "ipxe_files" {

depends_on = [metal_device.lb, null_resource.dircheck]
depends_on = [equinix_metal_device.lb, null_resource.dircheck]
for_each = toset(var.nodes)

provisioner "file" {
Expand All @@ -72,7 +72,7 @@ resource "null_resource" "ipxe_files" {

content = templatefile("${path.module}/assets/ipxe.tpl", {
node_type = each.value
bastion_ip = metal_device.lb.access_public_ipv4
bastion_ip = equinix_metal_device.lb.access_public_ipv4
ocp_version = var.ocp_version
ocp_version_zstream = var.ocp_version_zstream
})
Expand All @@ -95,7 +95,7 @@ resource "null_resource" "ipxe_files" {

resource "null_resource" "ignition_append_files" {

depends_on = [metal_device.lb, null_resource.dircheck]
depends_on = [equinix_metal_device.lb, null_resource.dircheck]
for_each = toset(var.nodes)

provisioner "file" {
Expand All @@ -107,7 +107,7 @@ resource "null_resource" "ignition_append_files" {

content = templatefile("${path.module}/assets/ignition-append.json.tpl", {
node_type = each.value
bastion_ip = metal_device.lb.access_public_ipv4
bastion_ip = equinix_metal_device.lb.access_public_ipv4
cluster_name = var.cluster_name
cluster_basedomain = var.cluster_basedomain
})
Expand Down
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ terraform {

equinix = {
source = "equinix/equinix"
version = "1.11.1"
version = "1.14.1"
}
null = {
source = "hashicorp/null"
}
}
required_version = ">= 0.14"
required_version = ">= 1"
}

0 comments on commit 784e20b

Please sign in to comment.