Option to use guest cpu mode

docs/quickstart.md

@@ -53,6 +53,7 @@ Update the following variables specific to your cluster requirement. All the var
 
 Update the following variables specific to the nodes.
 
+ * `cpu_mode` : (Optional) Guest CPU mode value. Eg: custom, host-passthrough, host-model.
  * `network_cidr` : (Optional) Network subnet range for the cluster. Ensure it is unique for each cluster on the same host. Default is set to '192.168.27.0/24'.
  * `rhel_username` : (Optional) The user that we should use for the connection to the bastion host. Default is set to 'root'.
  * `rhel_password` : (Optional) The password for above username for the connection to the bastion host initially. Leave empty if ssh-key is already set on bastion_image.
@@ -61,7 +62,7 @@ Update the following variables specific to the nodes.
  * `private_key_file` : (Optional) Corresponding private key file. Default path is '~/.ssh/id_rsa'.
  * `private_key` : (Optional) The contents of an SSH key to use for the connection. Ignored if `public_key_file` is provided.
  * `public_key` :(Optional) The contents of corresponding key to use for the connection. Ignored if `public_key_file` is provided.
- * `rhel_subscription_username` : (Optional) The username required for RHEL subcription on bastion host. Leave empty if repos are already set in the bastion_imageyy and subscription is not needed.
+ * `rhel_subscription_username` : (Optional) The username required for RHEL subcription on bastion host. Leave empty if repos are already set in the bastion_image and subscription is not needed.
  * `rhel_subscription_password` : (Optional) The password required for RHEL subcription on bastion host.
 
 ### Setup OpenShift Variables

modules/1_prepare/prepare.tf

@@ -87,7 +87,7 @@ resource "libvirt_domain" "bastion" {
     }
 
     cpu = {
-        mode = "host-passthrough"
+        mode = var.cpu_mode
     }
 
     network_interface {
@@ -146,18 +146,6 @@ then
     sudo subscription-manager refresh
     sudo subscription-manager attach --auto
 fi
-EOF
-        ]
-    }
-    provisioner "remote-exec" {
-        when        = destroy
-        on_failure  = continue
-        inline = [<<EOF
-if [ '${var.rhel_subscription_username}' != '' ]
-then
-    sudo subscription-manager unregister
-    sudo subscription-manager remove --all
-fi
 EOF
         ]
     }

modules/1_prepare/variables.tf

@@ -32,6 +32,9 @@ variable "bastion" {
         vcpu    = 2
     }
 }
+
+variable "cpu_mode" {}
+
 variable "bastion_image" { default   = "file:///home/libvirt/images/bastion.qcow2" }
 
 variable "rhel_username" {}

modules/4_nodes/nodes.tf

@@ -153,7 +153,7 @@ resource "libvirt_domain" "bootstrap" {
         target_port = 0
     }
     cpu = {
-        mode = "host-passthrough"
+        mode = var.cpu_mode
     }
     network_interface {
         network_id  = var.network_id
@@ -177,7 +177,7 @@ resource "libvirt_domain" "master" {
         target_port = 0
     }
     cpu = {
-        mode = "host-passthrough"
+        mode = var.cpu_mode
     }
     network_interface {
         network_id  = var.network_id
@@ -201,7 +201,7 @@ resource "libvirt_domain" "worker" {
         target_port = 0
     }
     cpu = {
-        mode = "host-passthrough"
+        mode = var.cpu_mode
     }
     network_interface {
         network_id  = var.network_id

modules/4_nodes/variables.tf

@@ -44,6 +44,8 @@ variable "worker" {
     }
 }
 
+variable "cpu_mode" {}
+
 variable "rhcos_image" {}
 variable "storage_pool_name" {}
 variable "network_cidr" {}

ocp.tf

@@ -37,6 +37,7 @@ module "prepare" {
     cluster_domain                  = var.cluster_domain
     cluster_id                      = "${random_id.label.hex}"
     bastion                         = var.bastion
+    cpu_mode                        = var.cpu_mode
     bastion_image                   = var.bastion_image
     rhel_username                   = var.rhel_username
     rhel_password                   = var.rhel_password
@@ -61,6 +62,7 @@ module "nodes" {
     bootstrap                       = var.bootstrap
     master                          = var.master
     worker                          = var.worker
+    cpu_mode                        = var.cpu_mode
     rhcos_image                     = var.rhcos_image
     storage_pool_name               = module.prepare.storage_pool_name
     network_cidr                    = var.network_cidr

var.tfvars

@@ -10,6 +10,7 @@ bastion         = { memory = 8192, vcpu = 2 }
 bootstrap       = { memory = 8192, vcpu = 4, count = 1 }
 master          = { memory = 16384, vcpu = 4, count = 3 }
 worker          = { memory = 16384, vcpu = 4, count = 2 }
+cpu_mode        = ""
 network_cidr    = "192.168.88.0/24"
 rhel_username   = "root"
 rhel_password   = "123456"

variables.tf

@@ -80,6 +80,11 @@ variable "worker" {
     }
 }
 
+variable "cpu_mode" {
+    description = "Optional guest CPU mode value. Eg: custom, host-passthrough, host-model"
+    default     = ""
+}
+
 variable "network_cidr" {
     description = "Network subnet range for the cluster nodes"
     default     = "192.168.27.0/24"