Move puppet server config out of template

Author: cmd-ntrf

common/configuration/main.tf

@@ -93,11 +93,19 @@ locals {
     software_stack = var.software_stack,
   })
 
-  puppet_conf = [
-    { key = "waitforcert", value = "15s", section = "main" },
-    { key = "report", value = "true", section = "main" },
-    { key = "postrun_command", value = "/opt/puppetlabs/bin/postrun", section = "main" }
-  ]
+  puppetservers = {
+    for host, values in var.inventory : host => try(values.local_ip, "") if contains(values.tags, "puppet")
+  }
+  puppet_conf = concat(
+    length(local.puppetservers) > 0 ? [
+      { key = "server", value = keys(local.puppetservers)[0], section = "main" }
+    ] : [],
+    [
+      { key = "waitforcert", value = "15s", section = "main" },
+      { key = "report", value = "true", section = "main" },
+      { key = "postrun_command", value = "/opt/puppetlabs/bin/postrun", section = "main" }
+    ],
+  )
 
   user_data = {
     for key, values in var.inventory : key =>
@@ -112,7 +120,7 @@ locals {
         domain_name           = var.domain_name
         puppetenv_git         = var.config_git_url,
         puppetenv_rev         = var.config_version,
-        puppetservers         = { for host, values in var.inventory : host => try(values.local_ip, "") if contains(values.tags, "puppet") }
+        puppetservers         = local.puppetservers
         puppetserver_password = local.puppet_passwd,
         puppet_conf           = concat(local.puppet_conf, var.puppet_conf, [{ key = "certname", value = key, section = "main" }])
         sudoer_username       = var.sudoer_username,

common/configuration/puppet.yaml.tftpl

@@ -134,9 +134,6 @@ runcmd:
 %{ endif ~}
   - chgrp puppet /etc/puppetlabs/puppet/csr_attributes.yaml
 %{ endif ~}
-%{ if length(puppetservers) > 0 ~}
-  - /opt/puppetlabs/bin/puppet config set server ${keys(puppetservers)[0]}
-%{ endif ~}
 %{ for conf in puppet_conf ~}
   - ${jsonencode(["/opt/puppetlabs/bin/puppet", "config", "set", conf.key, conf.value, "--section", conf.section])}
 %{ endfor ~}