Merge pull request #307 from ComputeCanada/cloud_facts

Move cloud facts in user-data (puppet.yaml)
ComputeCanada · May 13, 2024 · ce307a1 · ce307a1
2 parents 5d13213 + 16ecd23
commit ce307a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/common/configuration/main.tf b/common/configuration/main.tf
@@ -87,17 +87,14 @@ locals {
 
   terraform_facts = yamlencode({
     software_stack = var.software_stack,
-    cloud          = {
-      provider = var.cloud_provider
-      region = var.cloud_region
-    }
   })
 
   user_data = {
     for key, values in var.inventory : key =>
     templatefile("${path.module}/puppet.yaml",
       {
         cloud_provider        = var.cloud_provider
+        cloud_region          = var.cloud_region
         tags                  = values.tags
         node_name             = key,
         node_prefix           = values.prefix,

diff --git a/common/configuration/puppet.yaml b/common/configuration/puppet.yaml
@@ -134,13 +134,15 @@ write_files:
           %{ if cloud_provider != "gcp" } "GCE", %{ endif }
         ],
       }
-
     path: /etc/puppetlabs/facter/facter.conf
     permissions: "0644"
-  - path: /etc/puppetlabs/facter/facts.d/prefix.yaml
-    content: |
+  - content: |
       ---
       prefix : "${node_prefix}"
+      cloud:
+        provider: "${cloud_provider}"
+        region: "${cloud_region}"
+    path: /etc/puppetlabs/facter/facts.d/prefix.yaml
     permissions: "0644"
 %{ if contains(tags, "puppet") ~}
   - content: |