Merge pull request #82 from appuio/feat/exoscale-template

Switch to new `exoscale_template` data source
appuio · Jul 7, 2023 · 3df3b67 · 3df3b67
2 parents 84d431a + 92d034a
commit 3df3b67
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/bootstrap.tf b/bootstrap.tf
@@ -10,7 +10,7 @@ module "bootstrap" {
   role           = "bootstrap"
   node_count     = var.bootstrap_count
   region         = var.region
-  template_id    = data.exoscale_compute_template.rhcos.id
+  template_id    = data.exoscale_template.rhcos.id
   base_domain    = var.base_domain
   instance_type  = "standard.extra-large"
   node_state     = var.bootstrap_state

diff --git a/control_plane.tf b/control_plane.tf
@@ -6,7 +6,7 @@ module "master" {
   role           = "master"
   node_count     = var.master_count
   region         = var.region
-  template_id    = data.exoscale_compute_template.rhcos.id
+  template_id    = data.exoscale_template.rhcos.id
   base_domain    = var.base_domain
   instance_type  = "standard.extra-large"
   node_state     = var.master_state

diff --git a/infra.tf b/infra.tf
@@ -6,7 +6,7 @@ module "infra" {
   role           = "infra"
   node_count     = var.infra_count
   region         = var.region
-  template_id    = data.exoscale_compute_template.rhcos.id
+  template_id    = data.exoscale_template.rhcos.id
   base_domain    = var.base_domain
   instance_type  = var.infra_type
   node_state     = var.infra_state

diff --git a/main.tf b/main.tf
@@ -21,10 +21,10 @@ data "exoscale_domain_record" "exo_nameservers" {
   }
 }
 
-data "exoscale_compute_template" "rhcos" {
-  zone   = var.region
-  name   = var.rhcos_template
-  filter = "mine"
+data "exoscale_template" "rhcos" {
+  zone       = var.region
+  name       = var.rhcos_template
+  visibility = "private"
 }
 
 resource "exoscale_ssh_key" "admin" {

diff --git a/storage.tf b/storage.tf
@@ -6,7 +6,7 @@ module "storage" {
   role           = "storage"
   node_count     = var.storage_count
   region         = var.region
-  template_id    = data.exoscale_compute_template.rhcos.id
+  template_id    = data.exoscale_template.rhcos.id
   base_domain    = var.base_domain
   instance_type  = var.storage_type
   node_state     = var.storage_state

diff --git a/worker.tf b/worker.tf
@@ -8,7 +8,7 @@ module "worker" {
   role           = "worker"
   node_count     = var.worker_count
   region         = var.region
-  template_id    = data.exoscale_compute_template.rhcos.id
+  template_id    = data.exoscale_template.rhcos.id
   base_domain    = var.base_domain
   instance_type  = var.worker_type
   node_state     = var.worker_state
@@ -57,7 +57,7 @@ module "additional_worker" {
   data_disk_size = each.value.data_disk_size != null ? each.value.data_disk_size : 0
 
   region       = var.region
-  template_id  = data.exoscale_compute_template.rhcos.id
+  template_id  = data.exoscale_template.rhcos.id
   base_domain  = var.base_domain
   ssh_key_pair = local.ssh_key_name