QAM: Enabling Centos6 and Centos8 VMs on 4.1

Author: srbarrios

terracumber_config/tf_files/SUSEManager-4.1-qam.tf

@@ -123,7 +123,7 @@ module "base2" {
   name_prefix = "qam-pip-41-"
   use_avahi   = false
   domain      = "qa.prv.suse.net"
-  images      = [ "sles11sp4", "sles12sp4", "sles15", /*"centos6o", */ "centos7o" ]
+  images      = [ "sles11sp4", "sles12sp4", "sles15", "centos6o", "centos7o" ]
 
   mirror = "minima-mirror.qa.prv.suse.net"
   use_mirror_images = true
@@ -149,7 +149,7 @@ module "base3" {
   name_prefix = "qam-pip-41-"
   use_avahi   = false
   domain      = "qa.prv.suse.net"
-  images      = [ "sles15sp1", "ubuntu1604", "ubuntu1804o" /* , "ubuntu2004o", "centos8o" */ ]
+  images      = [ "sles15sp1", "ubuntu1604", "ubuntu1804o", "ubuntu2004o", "centos8o" ]
 
   mirror = "minima-mirror.qa.prv.suse.net"
   use_mirror_images = true
@@ -329,7 +329,6 @@ module "centos7-client" {
   ssh_key_path  = "./salt/controller/id_rsa.pub"
 }
 
-/*
 module "centos6-client" {
   providers = {
     libvirt = libvirt.classic179
@@ -347,7 +346,6 @@ module "centos6-client" {
   server_configuration =  { hostname = "qam-pip-41-pxy.qa.prv.suse.net" }
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
-*/
 
 module "sles12sp4-minion" {
   providers = {
@@ -435,7 +433,6 @@ module "sles15sp1-minion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-/*
 module "centos8-minion" {
   providers = {
     libvirt = libvirt.classic181
@@ -456,7 +453,6 @@ module "centos8-minion" {
   use_os_released_updates = false
   ssh_key_path           = "./salt/controller/id_rsa.pub"
 }
-*/
 
 module "centos7-minion" {
   providers = {
@@ -479,7 +475,6 @@ module "centos7-minion" {
   ssh_key_path           = "./salt/controller/id_rsa.pub"
 }
 
-/*
 module "centos6-minion" {
   providers = {
     libvirt = libvirt.classic179
@@ -499,6 +494,7 @@ module "centos6-minion" {
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "ubuntu2004-minion" {
   providers = {
     libvirt = libvirt.classic181
@@ -631,7 +627,6 @@ module "sles15sp1-sshminion" {
   ssh_key_path            = "./salt/controller/id_rsa.pub"
 }
 
-/*
 module "centos8-sshminion" {
   providers = {
     libvirt = libvirt.classic181
@@ -648,7 +643,6 @@ module "centos8-sshminion" {
   use_os_released_updates = false
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
-*/
 
 module "centos7-sshminion" {
   providers = {
@@ -667,7 +661,6 @@ module "centos7-sshminion" {
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
 
-/*
 module "centos6-sshminion" {
   providers = {
     libvirt = libvirt.classic179
@@ -685,6 +678,7 @@ module "centos6-sshminion" {
   ssh_key_path = "./salt/controller/id_rsa.pub"
 }
 
+/*
 module "ubuntu2004-sshminion" {
   providers = {
     libvirt = libvirt.classic181
@@ -754,16 +748,16 @@ module "controller" {
   server_configuration = module.server.configuration
   proxy_configuration  = module.proxy.configuration
 
-#  centos6_client_configuration = module.centos6-client.configuration
-#  centos6_minion_configuration = module.centos6-minion.configuration
-#  centos6_sshminion_configuration = module.centos6-sshminion.configuration
+  centos6_client_configuration = module.centos6-client.configuration
+  centos6_minion_configuration = module.centos6-minion.configuration
+  centos6_sshminion_configuration = module.centos6-sshminion.configuration
 
   centos7_client_configuration    = module.centos7-client.configuration
   centos7_minion_configuration    = module.centos7-minion.configuration
   centos7_sshminion_configuration = module.centos7-sshminion.configuration
 
-#  centos8_minion_configuration    = module.centos8-minion.configuration
-#  centos8_sshminion_configuration = module.centos8-sshminion.configuration
+  centos8_minion_configuration    = module.centos8-minion.configuration
+  centos8_sshminion_configuration = module.centos8-sshminion.configuration
 
   sle11sp4_client_configuration    = module.sles11sp4-client.configuration
   sle11sp4_minion_configuration    = module.sles11sp4-minion.configuration