Add option to set salt log level to debug

Author: FelixStegmeier

backend_modules/aws/host/main.tf

@@ -39,6 +39,8 @@ locals {
   route53_domain                       = lookup(var.base_configuration, "route53_domain", null)
   product_version                      = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
 
+  salt_log_lvl_debug = lookup(var.provider_settings, "salt_log_lvl_debug", false)
+
   resource_name_prefix = "${var.base_configuration["name_prefix"]}${var.name}"
 
   availability_zone = var.base_configuration["availability_zone"]
@@ -289,6 +291,7 @@ resource "null_resource" "host_salt_configuration" {
         ipv6                          = var.ipv6
         data_disk_device              = contains(var.roles, "server") || contains(var.roles, "server_containerized") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? local.data_disk_device : null
         second_data_disk_device       = contains(var.roles, "server") || contains(var.roles, "server_containerized") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? local.second_data_disk_device : null
+        salt_log_lvl_debug            = local.salt_log_lvl_debug
       },
       var.grains))
     destination = "/tmp/grains"

backend_modules/azure/host/main.tf

@@ -31,6 +31,8 @@ locals {
   location                             = var.base_configuration["location"]
   product_version                      = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
 
+  salt_log_lvl_debug = lookup(var.provider_settings, "salt_log_lvl_debug", false)
+
   user_data = templatefile("${path.module}/user_data.yaml", {
     image                    = var.image
     public_instance          = local.public_instance
@@ -197,6 +199,7 @@ resource "azurerm_virtual_machine_data_disk_attachment" "addtionaldisks-attach"
         ipv6                          = var.ipv6
         data_disk_device              = contains(var.roles, "server") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? "sdb" : null
         second_data_disk_device       = contains(var.roles, "server") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? "sdc" : null
+        salt_log_lvl_debug            = local.salt_log_lvl_debug
       },
       var.grains))
     destination = "/tmp/grains"

backend_modules/libvirt/host/main.tf

@@ -16,6 +16,7 @@ locals {
   ]
   container_runtime = lookup(var.grains, "container_runtime", "")
   product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
+  salt_log_lvl_debug = lookup(var.provider_settings, "salt_log_lvl_debug", false)
 
   combustion = contains(local.combustion_images, var.image)
   provider_settings = merge({
@@ -248,6 +249,7 @@ resource "null_resource" "provisioning" {
         authorized_keys           = var.ssh_key_path
         gpg_keys                  = var.gpg_keys
         ipv6                      = var.ipv6
+        salt_log_lvl_debug        = local.salt_log_lvl_debug
     })
   }
 
@@ -303,6 +305,7 @@ resource "null_resource" "provisioning" {
         data_disk_device              = contains(var.roles, "server") || contains(var.roles, "server_containerized") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? "vdb" : null
         second_data_disk_device       = contains(var.roles, "server") || contains(var.roles, "server_containerized") || contains(var.roles, "proxy") || contains(var.roles, "mirror") || contains(var.roles, "jenkins") ? "vdc" : null
         provider                      = "libvirt"
+        salt_log_lvl_debug            = local.salt_log_lvl_debug
       },
       var.grains))
     destination = "/tmp/grains"

salt/default/init.sls

@@ -39,3 +39,10 @@ authorized_keys:
 {% endfor %}
     - makedirs: True
 {% endif %}
+
+{% if grains.get('salt_log_lvl_debug') %}
+write_debug:
+  file.append:
+    - name: /etc/venv-salt-minion/minion.d/00-venv.conf
+    - text: "log_level: debug"
+{% endif %}