From beac99e2a592c06e33b71a227cb42c1e62128c2b Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@redhat.com>
Date: Thu, 23 Aug 2018 12:55:55 -0500
Subject: [PATCH] libvirt: hardcode memory and vcpus, boost vcpu default from 1
 to 2

---
 steps/etcd/libvirt/main.tf               |  3 ++-
 steps/joining_workers/libvirt/workers.tf |  3 ++-
 steps/masters/libvirt/main.tf            |  3 ++-
 steps/variables-libvirt.tf               | 18 ------------------
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/steps/etcd/libvirt/main.tf b/steps/etcd/libvirt/main.tf
index b012a1deb85..8a87c6548c2 100644
--- a/steps/etcd/libvirt/main.tf
+++ b/steps/etcd/libvirt/main.tf
@@ -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 {
diff --git a/steps/joining_workers/libvirt/workers.tf b/steps/joining_workers/libvirt/workers.tf
index aed41901890..8edc359c102 100644
--- a/steps/joining_workers/libvirt/workers.tf
+++ b/steps/joining_workers/libvirt/workers.tf
@@ -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 {
diff --git a/steps/masters/libvirt/main.tf b/steps/masters/libvirt/main.tf
index 305fa7ea6d0..a72361b9bf3 100644
--- a/steps/masters/libvirt/main.tf
+++ b/steps/masters/libvirt/main.tf
@@ -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
diff --git a/steps/variables-libvirt.tf b/steps/variables-libvirt.tf
index 0a82983ec38..8bd54067bb2 100644
--- a/steps/variables-libvirt.tf
+++ b/steps/variables-libvirt.tf
@@ -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"
-}