Update

Author: MonolithProjects

README.md

@@ -24,12 +24,17 @@ Terraform module for KVM/Libvirt Virtual Machine. This module will create a libv
 |vm_hostname_prefix|VM hostname prefix|vm
 |memory|RAM in MB|512
 |vcpu|Number of vCPUs|1
+|system_volume|System Volume size (GB)|10
 |dhcp|Use DHCP or Static IP settings|false
 |ip_address|"List of IP addresses|[ "192.168.123.1" ]
+|ip_nameserver|IP addresses of a nameserver|192.168.123.1
+|ip_gateway|IP addresses of a gateway|192.168.123.1
+|ssh_admin|Admin user with ssh access|ssh-admin
 |ssh_keys|List of public ssh keys| []
-|admin_passwd|Admin user password|password_example
-|ssh_username|User for SSH test|ssh-bot"
-|ssh_private_key|Private key for SSH test|~/.ssh/deployer_keys/id_ed25519
+|local_admin|Admin user without ssh access|local-admin
+|local_admin_passwd|Local admin user password|password_example
+|time_zone|Time Zone|UTC
+|ssh_private_key|Private key for SSH connection test|~/.ssh/deployer_keys/id_ed25519
 
 **Cloud_init** configuration can be found in `modules/virt-machine/templates`.
 
@@ -51,23 +56,33 @@ terraform {
 }
 
 provider "libvirt" {
-  uri = "qemu+ssh://[email protected].123.100/system"
+  uri = "qemu+ssh://[email protected].165.100/system"
 }
 
-module "k3s_nodes" {
+module "nodes" {
   source      = "./modules/virt-machine"
+  vm_hostname_prefix = "server"
   vm_count    = 3
   memory      = "2048"
   vcpu        = 1
+  system_volume = 20
   dhcp        = false
-  os_img_url  = "file:///home/myuser/ubuntu-20.04-server-cloudimg-amd64.img"
   ip_address  = [ 
-                  "192.168.123.101",
-                  "192.168.123.102",
-                  "192.168.123.103" 
+                  "192.168.165.151",
+                  "192.168.165.152",
+                  "192.168.165.153" 
                 ]
-  admin_passwd = "$6$rounds=4-XXXXXXXXXXXXXXXXX-HASHED-PASSWORD"
-  ssh_keys    = [ "ssh-ed25519 XXXXXXXXXXXXXXXXX example", ]
+  ip_gateway  = "192.168.165.254"
+  ip_nameserver = "192.168.165.104"
+  local_admin = "local-admin"
+  ssh_admin   = "ci-user"
+  ssh_private_key = "~/.ssh/id_ed25519"
+  local_admin_passwd = "$6$rounds=4096$xxxxxxxxHASHEDxxxPASSWORD"
+  ssh_keys    = [ 
+    "ssh-ed25519 AAAAxxxxxxxxxxxxSSHxxxKEY example", 
+    ]
+  time_zone   = "CET"
+  os_img_url  = "file:///home/myuser/ubuntu-20.04-server-cloudimg-amd64.img"
 }
 
 ```

modules/virt-machine/cloud_init.tf

@@ -3,16 +3,21 @@ data "template_file" "network_config" {
   template = file("${path.module}/templates/network_config_${var.dhcp == true ? "dhcp" : "static"}.tpl")
   vars = {
     ip_address = element(var.ip_address, count.index)
+    ip_gateway = var.ip_gateway
+    ip_nameserver = var.ip_nameserver
   }
 }
 
 data "template_file" "init_config" {
   count = var.vm_count
   template = file("${path.module}/templates/cloud_init.tpl")
   vars = {
+    ssh_admin = var.ssh_admin
     ssh_keys = local.all_keys
-    admin_passwd = var.admin_passwd
-    hostname = format("${var.vm_hostname_prefix}_%02d", count.index + 1)
+    local_admin = var.local_admin
+    local_admin_passwd = var.local_admin_passwd
+    hostname = format("${var.vm_hostname_prefix}%02d", count.index + 1)
+    time_zone = var.time_zone
   }
 }
 
@@ -32,7 +37,7 @@ data "template_cloudinit_config" "init_config" {
   base64_encode = false
 
   part {
-    filename     = format("init_%02d.cfg", count.index + 1)
+    filename     = format("init%02d.cfg", count.index + 1)
     content_type = "text/cloud-config"
     content      = data.template_file.init_config[count.index].rendered
   }

modules/virt-machine/main.tf

@@ -12,7 +12,7 @@ terraform {
 
 resource "libvirt_domain" "virt-machine" {
   count  = var.vm_count
-  name   = format("${var.vm_hostname_prefix}_%02d", count.index + 1)
+  name   = format("${var.vm_hostname_prefix}%02d", count.index + 1)
   memory = var.memory
   vcpu   = var.vcpu
 
@@ -21,7 +21,7 @@ resource "libvirt_domain" "virt-machine" {
   network_interface {
     bridge         = "br0"
     wait_for_lease = false
-    hostname       = format("${var.vm_hostname_prefix}_%02d", count.index + 1)
+    hostname       = format("${var.vm_hostname_prefix}%02d", count.index + 1)
   }
 
   console {
@@ -55,7 +55,7 @@ resource "libvirt_domain" "virt-machine" {
 
     connection {
       type                = "ssh"
-      user                = var.ssh_username
+      user                = var.ssh_admin
       host                = var.ip_address[0]
       private_key         = file(var.ssh_private_key)
       timeout             = "2m"

modules/virt-machine/storage.tf

@@ -4,11 +4,19 @@ resource "libvirt_pool" "terra" {
   path = var.libvirt_disk_path
 }
 
+resource "libvirt_volume" "base-volume-qcow2" {
+  name   = format("${var.vm_hostname_prefix}-base.qcow2")
+  pool   = libvirt_pool.terra.name
+  source = var.os_img_url
+  format = "qcow2"
+}
+
 resource "libvirt_volume" "volume-qcow2" {
   count  = var.vm_count
-  name   = format("${var.vm_hostname_prefix}_%02d", count.index + 1)
+  name   = format("${var.vm_hostname_prefix}%02d.qcow2", count.index + 1)
   pool   = libvirt_pool.terra.name
-  source = var.os_img_url
+  size   = 1024*1024*1024*var.system_volume
+  base_volume_id = libvirt_volume.base-volume-qcow2.id
   format = "qcow2"
 }
 

modules/virt-machine/templates/cloud_init.tpl

@@ -9,18 +9,18 @@ packages:
 fqdn: ${hostname}
 
 users:
-  - name: ssh-bot
+  - name: ${ssh_admin}
     gecos: CI User
     lock-passwd: false
     sudo: ALL=(ALL) NOPASSWD:ALL
     system: False
     ssh_authorized_keys: ${ssh_keys}
     shell: /bin/bash
-  - name: localadmin
+  - name: ${local_admin}
     gecos: Local admin (no SSH)
     lock-passwd: false
     sudo: ALL=(ALL) ALL
-    passwd: ${admin_passwd}
+    passwd: ${local_admin_passwd}
     shell: /bin/bash
 
 write_files:
@@ -55,8 +55,7 @@ write_files:
          AcceptEnv LANG LC_*
          Subsystem sftp /usr/lib/openssh/sftp-server
          UsePAM yes
-         AllowUsers ssh-bot
-         DenyUsers localadmin
+         AllowUsers ${ssh_admin}
 
 growpart:
     mode: auto
@@ -65,5 +64,5 @@ growpart:
 
 resize_rootfs: true
 
-timezone: CET
+timezone: ${time_zone}
 

modules/virt-machine/templates/network_config_static.tpl

@@ -3,8 +3,8 @@ ethernets:
   ens3:
     dhcp4: no
     addresses: [${ip_address}/24]
-    gateway4: 192.168.123.254
+    gateway4: ${ip_gateway}
     nameservers:
        addresses: 
-        - 192.168.123.254
+        - ${ip_nameserver}
         - 8.8.8.8

modules/virt-machine/variables.tf

@@ -1,12 +1,8 @@
-#### Storage ####
-
 variable "libvirt_disk_path" {
   description = "Path to libvirt Disk pool"
   default     = "/mnt/terra"
 }
 
-#### Virtual Machine ####
-
 variable "os_img_url" {
   description = "URL to the OS image"
   default     = "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
@@ -36,10 +32,14 @@ variable "memory" {
 
 variable "vcpu" {
   description = "Number of vCPUs"
-  type = string
   default = 1
 }
 
+variable "system_volume" {
+  description = "System Volume size (GB)"
+  default = 10
+}
+
 variable "dhcp" {
   description = "Use DHCP or Static IP settings"
   type        = bool
@@ -52,25 +52,43 @@ variable "ip_address" {
   default     = [ "192.168.123.1" ]
 }
 
+variable "ip_nameserver" {
+  description = "IP addresses of a nameserver"
+  default     = "192.168.123.1"
+}
+
+variable "ip_gateway" {
+  description = "IP addresses of a gateway"
+  default     = "192.168.123.1"
+}
+
+variable "ssh_admin" {
+  description = "Admin user with ssh access"
+  default = "ssh-admin"
+}
+
 variable "ssh_keys" {
   description = "List of public ssh keys"
   type        = list(string)
   default     = []
 }
 
-variable "admin_passwd" {
-  description = "Admin user password"
-  default     = "password_example"
+variable "local_admin" {
+  description = "Admin user without ssh access"
+  default     = "local-admin"
 }
 
-#### Connection test (Optional) ###
+variable "local_admin_passwd" {
+  description = "Local admin user password"
+  default     = "password_example"
+}
 
-variable "ssh_username" {
-  description = "User for SSH test"
-  default     = "ssh-user"
+variable "time_zone" {
+  description = "Time Zone"
+  default     = "UTC"
 }
 
 variable "ssh_private_key" {
-  description = "Private key for SSH test"
+  description = "Private key for SSH connection test"
   default     = "~/.ssh/id_ed25519"
 }