Merge pull request #16 from chrodriguez/feature/runcmd

Add runcmd variable

Author: MonolithProjects

.github/workflows/lint.yml

@@ -10,4 +10,4 @@ jobs:
     - name: Check out code
       uses: actions/checkout@main
     - name: Terraform lint
-      uses: devops-infra/action-tflint@master
+      uses: devops-infra/action-tflint@master

.gitignore

@@ -1 +1 @@
-tests
+tests

CONTRIBUTING.md

@@ -28,4 +28,4 @@ Do the changes in your own GitHub namespace.
 Please create a pull request into the `develop` branch. Here is [how to do it](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
 
 
-Please consider to [sponsor](https://github.com/sponsors/monolithprojects) me :smirk:
+Please consider to [sponsor](https://github.com/sponsors/monolithprojects) me :smirk:

README.md

@@ -47,6 +47,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_additional_disk_ids"></a> [additional\_disk\_ids](#input\_additional\_disk\_ids) | List of volume ids | `list` | `[]` | no |
 | <a name="input_autostart"></a> [autostart](#input\_autostart) | Autostart the domain | `bool` | `true` | no |
 | <a name="input_base_pool_name"></a> [base\_pool\_name](#input\_base\_pool\_name) | Name of base OS image | `any` | `null` | no |
 | <a name="input_base_volume_name"></a> [base\_volume\_name](#input\_base\_volume\_name) | Name of base OS image | `any` | `null` | no |
@@ -63,6 +64,7 @@ No modules.
 | <a name="input_memory"></a> [memory](#input\_memory) | RAM in MB | `string` | `"1024"` | no |
 | <a name="input_os_img_url"></a> [os\_img\_url](#input\_os\_img\_url) | URL to the OS image | `string` | `"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"` | no |
 | <a name="input_pool"></a> [pool](#input\_pool) | Storage pool name | `string` | `"default"` | no |
+| <a name="input_runcmd"></a> [runcmd](#input\_runcmd) | Extra commands to be run with cloud init | `list(string)` | <pre>[<br>  "[ systemctl, daemon-reload ]",<br>  "[ systemctl, enable, qemu-guest-agent ]",<br>  "[ systemctl, start, qemu-guest-agent ]",<br>  "[ systemctl, restart, systemd-networkd ]"<br>]</pre> | no |
 | <a name="input_share_filesystem"></a> [share\_filesystem](#input\_share\_filesystem) | n/a | <pre>object({<br>    source   = string<br>    target   = string<br>    readonly = bool<br>    mode     = string<br>  })</pre> | <pre>{<br>  "mode": null,<br>  "readonly": false,<br>  "source": null,<br>  "target": null<br>}</pre> | no |
 | <a name="input_ssh_admin"></a> [ssh\_admin](#input\_ssh\_admin) | Admin user with ssh access | `string` | `"ssh-admin"` | no |
 | <a name="input_ssh_keys"></a> [ssh\_keys](#input\_ssh\_keys) | List of public ssh keys | `list(string)` | `[]` | no |
@@ -228,7 +230,7 @@ module "vm" {
   additional_disk_ids = [ libvirt_volume.data_volume.id ]
   dhcp        = true
   ssh_admin   = "admin"
-  ssh_keys    = [ 
+  ssh_keys    = [
     chomp(file("~/.ssh/id_rsa.pub"))
     ]
   time_zone   = "America/Argentina/Buenos_Aires"

cloud_init.tf

@@ -20,6 +20,7 @@ data "template_file" "init_config" {
     local_admin_passwd = var.local_admin_passwd
     hostname           = format("${var.vm_hostname_prefix}%02d", count.index + var.index_start)
     time_zone          = var.time_zone
+    runcmd             = local.runcmd
   }
 }
 
@@ -30,6 +31,11 @@ locals {
 "${keys}",
 %{~endfor~}
 ]
+EOT
+  runcmd   = <<EOT
+%{for cmd in var.runcmd~}
+  - ${cmd}
+%{endfor~}
 EOT
 }
 

output.tf

@@ -3,4 +3,4 @@ output "name" {
 }
 output "ip_address" {
   value = libvirt_domain.virt-machine.*.network_interface.0.addresses.0
-}
+}

templates/cloud_init.tpl

@@ -8,9 +8,7 @@ packages:
   - qemu-guest-agent
 
 runcmd:
-  - [ systemctl, daemon-reload ]
-  - [ systemctl, enable, qemu-guest-agent ]
-  - [ systemctl, start, qemu-guest-agent ]
+${runcmd}
 
 fqdn: ${hostname}
 
@@ -73,4 +71,3 @@ growpart:
 resize_rootfs: true
 
 timezone: ${time_zone}
-

templates/network_config_dhcp.tpl

@@ -1,4 +1,4 @@
 version: 2
 ethernets:
   ${nic}:
-    dhcp4: true
+    dhcp4: true

templates/network_config_static.tpl

@@ -5,6 +5,6 @@ ethernets:
     addresses: [${ip_address}/24]
     gateway4: ${ip_gateway}
     nameservers:
-       addresses: 
+       addresses:
         - ${ip_nameserver}
-        - 8.8.8.8
+        - 8.8.8.8

variables.tf

@@ -15,7 +15,7 @@ variable "base_pool_name" {
 
 variable "additional_disk_ids" {
   description = "List of volume ids"
-  default = []
+  default     = []
 }
 
 
@@ -166,3 +166,14 @@ variable "ssh_private_key" {
   description = "Private key for SSH connection test"
   default     = null
 }
+
+variable "runcmd" {
+  description = "Extra commands to be run with cloud init"
+  type        = list(string)
+  default = [
+    "[ systemctl, daemon-reload ]",
+    "[ systemctl, enable, qemu-guest-agent ]",
+    "[ systemctl, start, qemu-guest-agent ]",
+    "[ systemctl, restart, systemd-networkd ]"
+  ]
+}