Skip to content

Commit

Permalink
Add mininal cloudinit
Browse files Browse the repository at this point in the history
  • Loading branch information
MalloZup committed Sep 26, 2018
1 parent 8e79c28 commit 3a451ec
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 2 deletions.
12 changes: 12 additions & 0 deletions main.tf.libvirt.example
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,15 @@ module "minion" {
count = 1
// see modules/libvirt/minion/variables.tf for possible values
}

module "min-ubuntu" {
source = "./modules/libvirt/minion"
base_configuration = "${module.base.configuration}"
product_version = "3.2-released"
name = "min-ubuntu"
image = "ubuntu-1804"
memory = 1024
server_configuration = { hostname = "suma-head-pxy.mgr.suse.de" }
auto_connect_to_master = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}
2 changes: 1 addition & 1 deletion modules/libvirt/base/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ resource "libvirt_volume" "sles-es7_volume" {
resource "libvirt_volume" "ubuntu-1804_volume" {
name = "${var.name_prefix}ubuntu-1804"
source = "https://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img"
count = "${var.use_shared_resources ? 0 : (contains(var.images, "sles-es7") ? 1 : 0)}"
count = "${var.use_shared_resources ? 0 : (contains(var.images, "ubuntu-1804") ? 1 : 0)}"
pool = "${var.pool}"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/libvirt/base/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ variable "bridge" {

variable "images" {
description = "list of images to be uploaded to the libvirt host, leave default for all"
default = ["centos7", "opensuse423", "ubuntu1804", "sles15", "sles11sp4", "sles12", "sles12sp1", "sles12sp2", "sles12sp3", "sles-es7"]
default = ["centos7", "opensuse423", "ubuntu-1804", "sles15", "sles11sp4", "sles12", "sles12sp1", "sles12sp2", "sles12sp3", "sles-es7"]
type = "list"
}
18 changes: 18 additions & 0 deletions modules/libvirt/host/cloud_init.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#cloud-config
# vim: syntax=yaml
ssh_pwauth: True
chpasswd:
list: |
root:linux
expire: False

disable_root: false

# TODO: this is distro specific. we might endup just adding commands with OR.

# i think like this zypper ref || apt update || yum ..
apt_update: true

# TODO: just install salt-minion for the moment
packages:
- salt-minion
12 changes: 12 additions & 0 deletions modules/libvirt/host/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ resource "libvirt_volume" "main_disk" {
count = "${var.count}"
}


data "template_file" "user_data" {
template = "${file("${path.module}/cloud_init.cfg")}"
}

resource "libvirt_cloudinit_disk" "minimalconf" {
name = "${var.base_configuration["name_prefix"]}${var.name}${var.count > 1 ? "-${count.index + 1}" : ""}-minimalconf.iso"
user_data = "${data.template_file.user_data.rendered}"
}


resource "libvirt_domain" "domain" {
name = "${var.base_configuration["name_prefix"]}${var.name}${var.count > 1 ? "-${count.index + 1}" : ""}"
memory = "${var.memory}"
Expand All @@ -23,6 +34,7 @@ resource "libvirt_domain" "domain" {
count = "${var.count}"
qemu_agent = true

cloudinit = "${libvirt_cloudinit_disk.minimalconf.id}"
// base disk + additional disks if any
disk = ["${concat(
list(
Expand Down

0 comments on commit 3a451ec

Please sign in to comment.