ansible-debops-infrastructure

commit 511986c958a85b1e666407767fa5f6512c088398
parent e831f2f4d224d57aa38402ddf6b25997f2b40d0a
Author: Dionysis Grigoropoulos <dgrig@erethon.com>
Date:   Mon,  7 Dec 2020 02:35:08 +0200

oricono: Apply various updates

* Update to latest Debian image with different partition layout to allow
for growpart via cloudinit to work
* Add Kali and Tails LiveCD based hosts
* Update syntax to work with latest modules

Diffstat:
terraform/infrastructure/oricono/main.tf
 | 
63
++++++++++++++++++++++++++++++++++++++++++++++-----------------

1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/terraform/infrastructure/oricono/main.tf b/terraform/infrastructure/oricono/main.tf
@@ -11,15 +11,6 @@ module "ori_network" {
   network_dns_enabled      = false
 }
 
-module "hacky_network" {
-  source = "../../modules/libvirt_network"
-
-  network_bridge_interface = "virbr2"
-  network_name             = "hacky_network"
-  network_cidr             = ["192.168.145.0/24"]
-  network_dns_enabled      = false
-}
-
 resource "libvirt_volume" "base_debian_volume" {
   name   = "debian_base_volume"
   pool   = var.libvirt_storage_pool
@@ -27,6 +18,13 @@ resource "libvirt_volume" "base_debian_volume" {
   source = "/home/bsd/Disks/packer-debian10-base-v2"
 }
 
+resource "libvirt_volume" "base_debian_volume_v3" {
+  name   = "debian_base_volume_v3"
+  pool   = var.libvirt_storage_pool
+  format = "qcow2"
+  source = "/home/bsd/Disks/packer-debian10-base-v6"
+}
+
 resource "libvirt_volume" "base_openbsd_volume" {
   name   = "openbsd_base_volume"
   pool   = var.libvirt_storage_pool
@@ -45,7 +43,7 @@ module "dirty_debian_dev" {
   base_volume_id          = libvirt_volume.base_debian_volume.id
   disks                   = [{ "volume_id" : libvirt_volume.base_debian_volume.id }]
   network_id              = module.ori_network.id
-  network_cidr            = module.ori_network.cidr
+  network_cidr            = module.ori_network.cidr[0]
   network_host            = "2"
   enable_cloud_init       = true
   cloudinit_user_template = <<EOF
@@ -57,16 +55,16 @@ EOF
 module "nv_core" {
   source = "../../modules/libvirt_host"
 
-  host_name               = "nc_core"
+  host_name               = "nv_core"
   host_memory             = "1024"
   host_vcpu               = 1
   storage_pool            = var.libvirt_storage_pool
   volume_name             = "nv_core"
   volume_size             = "21474836480"
-  base_volume_id          = libvirt_volume.base_debian_volume.id
-  disks                   = [{ "volume_id" : libvirt_volume.base_debian_volume.id }]
+  base_volume_id          = libvirt_volume.base_debian_volume_v3.id
+  disks                   = [{ "volume_id" : libvirt_volume.base_debian_volume_v3.id }]
   network_id              = module.ori_network.id
-  network_cidr            = module.ori_network.cidr
+  network_cidr            = module.ori_network.cidr[0]
   network_host            = "3"
   enable_cloud_init       = true
   cloudinit_user_template = <<EOF
@@ -86,7 +84,7 @@ module "openbsd_68" {
   base_volume_id    = libvirt_volume.base_openbsd_volume.id
   disks             = [{ "volume_id" : libvirt_volume.base_openbsd_volume.id }]
   network_id        = module.ori_network.id
-  network_cidr      = module.ori_network.cidr
+  network_cidr      = module.ori_network.cidr[0]
   network_host      = "4"
   enable_cloud_init = false
 }
@@ -102,7 +100,7 @@ module "xorg_enabled" {
   base_volume_id          = libvirt_volume.base_debian_volume.id
   disks                   = [{ "volume_id" : libvirt_volume.base_debian_volume.id }]
   network_id              = module.ori_network.id
-  network_cidr            = module.ori_network.cidr
+  network_cidr            = module.ori_network.cidr[0]
   network_host            = "5"
   enable_cloud_init       = true
   cloudinit_user_template = <<EOF
@@ -122,11 +120,42 @@ module "rust_dev" {
   base_volume_id          = libvirt_volume.base_debian_volume.id
   disks                   = [{ "volume_id" : libvirt_volume.base_debian_volume.id }]
   network_id              = module.ori_network.id
-  network_cidr            = module.ori_network.cidr
+  network_cidr            = module.ori_network.cidr[0]
   network_host            = "7"
+  host_autostart          = false
   enable_cloud_init       = true
   cloudinit_user_template = <<EOF
 runcmd:
   - echo 'source /etc/network/interfaces.d/*' > /etc/network/interfaces
 EOF
 }
+
+module "kali_live" {
+  source = "../../modules/libvirt_host"
+
+  host_name               = "kali_live"
+  host_memory             = "4096"
+  host_vcpu               = 4
+  storage_pool            = var.libvirt_storage_pool
+  disks                   = [{"iso" : "/home/bsd/Disks/kali-linux-2020.4-live-amd64.iso" }]
+  network_id              = module.ori_network.id
+  network_cidr            = module.ori_network.cidr[0]
+  network_host            = "22"
+  enable_graphics = true
+  host_autostart          = false
+}
+
+module "tails_live" {
+  source = "../../modules/libvirt_host"
+
+  host_name               = "tails_live"
+  host_memory             = "2048"
+  host_vcpu               = 2
+  storage_pool            = var.libvirt_storage_pool
+  disks                   = [{"iso" : "/home/bsd/Disks/tails-amd64-4.13.iso" }]
+  network_id              = module.ori_network.id
+  network_cidr            = module.ori_network.cidr[0]
+  network_host            = "23"
+  enable_graphics = true
+  host_autostart          = false
+}