Use separate terraform variable to set services yaml

canonical · Jul 10, 2024 · 264f26a · 264f26a
1 parent f06bc1e
commit 264f26a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/anvil-python/anvil/commands/haproxy.py b/anvil-python/anvil/commands/haproxy.py
@@ -108,6 +108,12 @@ class DeployHAProxyApplicationStep(DeployMachineApplicationStep):
   server_options: maxconn 100 cookie S{"{i}"} check
   crts: [{HAPROXY_CERTS_DIR}]
 """
+    _DEFAULT_SERVICES_CONFIG: str = """- service_name: haproxy_service
+  service_host: "0.0.0.0"
+  service_port: 80
+  service_options: [balance leastconn, cookie SRVNAME insert]
+  server_options: maxconn 100 cookie S{i} check
+"""
 
     def __init__(
         self,
@@ -133,7 +139,7 @@ def __init__(
         )
         self.preseed = deployment_preseed or {}
         self.accept_defaults = accept_defaults
-        self.variables: dict[str, Any] = {"charm_haproxy_config": {}}
+        self.use_tls_termination = False
 
     def get_application_timeout(self) -> int:
         return HAPROXY_APP_TIMEOUT
@@ -144,11 +150,15 @@ def has_prompts(self) -> bool:
     def prompt(self, console: Console | None = None) -> None:
         variables = questions.load_answers(self.client, self._HAPROXY_CONFIG)
         variables.setdefault("virtual_ip", "")
-        variables.setdefault("charm_haproxy_config", {})
+        variables.setdefault(
+            "haproxy_services_yaml", self._DEFAULT_SERVICES_CONFIG
+        )
 
         # Set defaults
         self.preseed.setdefault("virtual_ip", "")
-        self.preseed.setdefault("charm_haproxy_config", {})
+        self.preseed.setdefault(
+            "haproxy_services_yaml", self._DEFAULT_SERVICES_CONFIG
+        )
 
         haproxy_config_bank = questions.QuestionBank(
             questions=haproxy_questions(),
@@ -173,15 +183,12 @@ def prompt(self, console: Console | None = None) -> None:
                 os.path.join(HAPROXY_CERTS_DIR, "haproxy.pem"), "w"
             ) as combined_file:
                 combined_file.write(key + cert)
-            variables["charm_haproxy_config"]["services"] = (
-                self._TLS_SERVICES_CONFIG
-            )
-            variables["haproxy_port"] = 443
+            variables["haproxy_services_yaml"] = self._TLS_SERVICES_CONFIG
+            self.use_tls_termination = True
         else:
             LOG.debug(
                 "No certificate/key provided, skipping TLS configuration"
             )
-            variables["haproxy_port"] = 80
 
         LOG.debug(variables)
         questions.write_answers(self.client, self._HAPROXY_CONFIG, variables)
@@ -190,6 +197,10 @@ def extra_tfvars(self) -> dict[str, Any]:
         variables: dict[str, Any] = questions.load_answers(
             self.client, self._HAPROXY_CONFIG
         )
+        if self.use_tls_termination:
+            variables["haproxy_port"] = 443
+        else:
+            variables["haproxy_port"] = 80
         LOG.debug(f"extra tfvars: {variables}")
         return variables
 

diff --git a/cloud/etc/deploy-haproxy/main.tf b/cloud/etc/deploy-haproxy/main.tf
@@ -46,7 +46,10 @@ resource "juju_application" "haproxy" {
     base     = "ubuntu@22.04"
   }
 
-  config = var.charm_haproxy_config
+  config = merge(
+    { services = var.haproxy_services_yaml },
+    var.charm_haproxy_config,
+  )
 }
 
 resource "juju_application" "keepalived" {

diff --git a/cloud/etc/deploy-haproxy/variables.tf b/cloud/etc/deploy-haproxy/variables.tf
@@ -60,6 +60,12 @@ variable "virtual_ip" {
   default     = ""
 }
 
+variable "haproxy_services_yaml" {
+  description = "yaml-formatted services definition for HA proxy charm"
+  type        = string
+  default     = ""
+}
+
 variable "haproxy_port" {
   description = "The port that HAProxy listens on"
   type        = string