Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libvirt: hardcode memory and vcpus, boost vcpu default from 1 to 2 #163

Merged
merged 1 commit into from
Aug 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion steps/etcd/libvirt/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ resource "libvirt_domain" "etcd" {
count = "${module.defaults.etcd_count}"

name = "etcd${count.index}"
memory = "${var.tectonic_libvirt_etcd_memory}"
memory = "1024"
vcpu = "2"
coreos_ignition = "${element(libvirt_ignition.etcd.*.id,count.index)}"

disk {
Expand Down
3 changes: 2 additions & 1 deletion steps/joining_workers/libvirt/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ resource "libvirt_domain" "worker" {
count = "${var.tectonic_worker_count}"

name = "worker${count.index}"
memory = "${var.tectonic_libvirt_worker_memory}"
memory = "1024"
vcpu = "2"
coreos_ignition = "${libvirt_ignition.worker.id}"

disk {
Expand Down
3 changes: 2 additions & 1 deletion steps/masters/libvirt/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ resource "libvirt_domain" "master" {

name = "master${count.index}"

memory = "${var.tectonic_libvirt_master_memory}"
memory = "2048"
vcpu = "2"

# Override ignition for the first (bootstrap) node. It can't be re-ignited,
# but that's okay for us
Expand Down
18 changes: 0 additions & 18 deletions steps/variables-libvirt.tf
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,3 @@ variable "tectonic_libvirt_first_ip_worker" {
description = "the offset in the ip range of the first worker"
default = "50"
}

variable "tectonic_libvirt_etcd_memory" {
type = "string"
description = "ram to allocate for each etcd node"
default = "1024"
}

variable "tectonic_libvirt_master_memory" {
type = "string"
description = "ram to allocate for each etcd node"
default = "2048"
}

variable "tectonic_libvirt_worker_memory" {
type = "string"
description = "ram to allocate for each etcd node"
default = "1024"
}