Skip to content

Commit 941207f

Browse files
BischoffBischoff
committed
Use non-official images for SLES 15 SP1 and comment out Ubuntu
1 parent 3d936a6 commit 941207f

File tree

1 file changed

+124
-121
lines changed

1 file changed

+124
-121
lines changed

‎terracumber_config/tf_files/SUSEManager-4.0-qam.tf

+124-121
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module "base" {
9797
name_prefix = "qam-pip-40-"
9898
use_avahi = false
9999
domain = "qa.prv.suse.net"
100-
images = [ "sles15o", "sles15sp1o", "opensuse150o" ]
100+
images = [ "sles15o", "sles15sp1", "opensuse150o" ]
101101

102102
mirror = "minima-mirror.qa.prv.suse.net"
103103
use_mirror_images = true
@@ -123,7 +123,7 @@ module "base2" {
123123
name_prefix = "qam-pip-40-"
124124
use_avahi = false
125125
domain = "qa.prv.suse.net"
126-
images = [ "sles11sp4", "sles12sp4o", "sles15o", "sles15sp1o", "centos6o", "centos7o" ]
126+
images = [ "sles11sp4", "sles12sp4o", "sles15o", "sles15sp1", "centos6o", "centos7o" ]
127127

128128
mirror = "minima-mirror.qa.prv.suse.net"
129129
use_mirror_images = true
@@ -149,7 +149,7 @@ module "base3" {
149149
name_prefix = "qam-pip-40-"
150150
use_avahi = false
151151
domain = "qa.prv.suse.net"
152-
images = [ "sles15sp1o", "ubuntu1804o", "ubuntu1604o", "ubuntu2004o", "centos8o" ]
152+
images = [ "sles15sp1", "ubuntu1804o", "ubuntu1604o", "ubuntu2004o", "centos8o" ]
153153

154154
mirror = "minima-mirror.qa.prv.suse.net"
155155
use_mirror_images = true
@@ -169,6 +169,7 @@ module "server" {
169169
base_configuration = module.base.configuration
170170
product_version = "4.0-released"
171171
name = "srv"
172+
image = "sles15sp1"
172173
provider_settings = {
173174
mac = "52:54:00:F6:5D:E8"
174175
memory = 40960
@@ -204,6 +205,7 @@ module "proxy" {
204205
base_configuration = module.base.configuration
205206
product_version = "4.0-released"
206207
name = "pxy"
208+
image = "sles15sp1"
207209
provider_settings = {
208210
mac = "52:54:00:F2:4D:7A"
209211
memory = 4096
@@ -295,7 +297,7 @@ module "sles15sp1-client" {
295297
base_configuration = module.base3.configuration
296298
product_version = "4.0-released"
297299
name = "cli-sles15sp1"
298-
image = "sles15sp1o"
300+
image = "sles15sp1"
299301
provider_settings = {
300302
mac = "52:54:00:BA:1D:11"
301303
memory = 2048
@@ -421,7 +423,7 @@ module "sles15sp1-minion" {
421423
base_configuration = module.base3.configuration
422424
product_version = "4.0-released"
423425
name = "min-sles15sp1"
424-
image = "sles15sp1o"
426+
image = "sles15sp1"
425427
provider_settings = {
426428
mac = "52:54:00:72:E5:BE"
427429
memory = 2048
@@ -496,66 +498,66 @@ module "centos6-minion" {
496498
ssh_key_path = "./salt/controller/id_rsa.pub"
497499
}
498500

499-
module "ubuntu2004-minion" {
500-
providers = {
501-
libvirt = libvirt.classic181
502-
}
503-
source = "./modules/minion"
504-
base_configuration = module.base3.configuration
505-
product_version = "4.0-released"
506-
name = "min-ubuntu2004"
507-
image = "ubuntu2004o"
508-
provider_settings = {
509-
mac = "52:54:00:2A:47:D8"
510-
memory = 2048
511-
}
512-
server_configuration = {
513-
hostname = "qam-pip-40-pxy.qa.prv.suse.net"
514-
}
515-
auto_connect_to_master = false
516-
use_os_released_updates = false
517-
ssh_key_path = "./salt/controller/id_rsa.pub"
518-
}
519-
520-
module "ubuntu1804-minion" {
521-
providers = {
522-
libvirt = libvirt.classic181
523-
}
524-
source = "./modules/minion"
525-
base_configuration = module.base3.configuration
526-
product_version = "4.0-released"
527-
name = "min-ubuntu1804"
528-
image = "ubuntu1804o"
529-
provider_settings = {
530-
mac = "52:54:00:D2:5E:EC"
531-
memory = 2048
532-
}
533-
server_configuration = {
534-
hostname = "qam-pip-40-pxy.qa.prv.suse.net"
535-
}
536-
auto_connect_to_master = false
537-
use_os_released_updates = false
538-
ssh_key_path = "./salt/controller/id_rsa.pub"
539-
}
540-
541-
module "ubuntu1604-minion" {
542-
providers = {
543-
libvirt = libvirt.classic181
544-
}
545-
source = "./modules/minion"
546-
base_configuration = module.base3.configuration
547-
product_version = "4.0-released"
548-
name = "min-ubuntu1604"
549-
image = "ubuntu1604o"
550-
provider_settings = {
551-
mac = "52:54:00:12:33:D8"
552-
memory = 2048
553-
}
554-
server_configuration = { hostname = "qam-pip-40-pxy.qa.prv.suse.net" }
555-
auto_connect_to_master = false
556-
use_os_released_updates = false
557-
ssh_key_path = "./salt/controller/id_rsa.pub"
558-
}
501+
# module "ubuntu2004-minion" {
502+
# providers = {
503+
# libvirt = libvirt.classic181
504+
# }
505+
# source = "./modules/minion"
506+
# base_configuration = module.base3.configuration
507+
# product_version = "4.0-released"
508+
# name = "min-ubuntu2004"
509+
# image = "ubuntu2004o"
510+
# provider_settings = {
511+
# mac = "52:54:00:2A:47:D8"
512+
# memory = 2048
513+
# }
514+
# server_configuration = {
515+
# hostname = "qam-pip-40-pxy.qa.prv.suse.net"
516+
# }
517+
# auto_connect_to_master = false
518+
# use_os_released_updates = false
519+
# ssh_key_path = "./salt/controller/id_rsa.pub"
520+
# }
521+
#
522+
# module "ubuntu1804-minion" {
523+
# providers = {
524+
# libvirt = libvirt.classic181
525+
# }
526+
# source = "./modules/minion"
527+
# base_configuration = module.base3.configuration
528+
# product_version = "4.0-released"
529+
# name = "min-ubuntu1804"
530+
# image = "ubuntu1804o"
531+
# provider_settings = {
532+
# mac = "52:54:00:D2:5E:EC"
533+
# memory = 2048
534+
# }
535+
# server_configuration = {
536+
# hostname = "qam-pip-40-pxy.qa.prv.suse.net"
537+
# }
538+
# auto_connect_to_master = false
539+
# use_os_released_updates = false
540+
# ssh_key_path = "./salt/controller/id_rsa.pub"
541+
# }
542+
#
543+
# module "ubuntu1604-minion" {
544+
# providers = {
545+
# libvirt = libvirt.classic181
546+
# }
547+
# source = "./modules/minion"
548+
# base_configuration = module.base3.configuration
549+
# product_version = "4.0-released"
550+
# name = "min-ubuntu1604"
551+
# image = "ubuntu1604o"
552+
# provider_settings = {
553+
# mac = "52:54:00:12:33:D8"
554+
# memory = 2048
555+
# }
556+
# server_configuration = { hostname = "qam-pip-40-pxy.qa.prv.suse.net" }
557+
# auto_connect_to_master = false
558+
# use_os_released_updates = false
559+
# ssh_key_path = "./salt/controller/id_rsa.pub"
560+
# }
559561

560562
module "sles12sp4-sshminion" {
561563
providers = {
@@ -617,7 +619,7 @@ module "sles15sp1-sshminion" {
617619
base_configuration = module.base3.configuration
618620
product_version = "4.0-released"
619621
name = "minssh-sles15sp1"
620-
image = "sles15sp1o"
622+
image = "sles15sp1"
621623
provider_settings = {
622624
mac = "52:54:00:26:7C:DE"
623625
memory = 2048
@@ -678,59 +680,60 @@ module "centos6-sshminion" {
678680
ssh_key_path = "./salt/controller/id_rsa.pub"
679681
}
680682

681-
module "ubuntu2004-sshminion" {
682-
providers = {
683-
libvirt = libvirt.classic181
684-
}
685-
source = "./modules/sshminion"
686-
base_configuration = module.base3.configuration
687-
product_version = "4.0-released"
688-
name = "minssh-ubuntu2004"
689-
image = "ubuntu2004o"
690-
provider_settings = {
691-
mac = "52:54:00:2A:47:D8"
692-
memory = 2048
693-
}
694-
use_os_released_updates = false
695-
ssh_key_path = "./salt/controller/id_rsa.pub"
696-
}
697-
698-
module "ubuntu1804-sshminion" {
699-
providers = {
700-
libvirt = libvirt.classic181
701-
}
702-
source = "./modules/sshminion"
703-
base_configuration = module.base3.configuration
704-
product_version = "4.0-released"
705-
name = "minssh-ubuntu1804"
706-
image = "ubuntu1804o"
707-
provider_settings = {
708-
mac = "52:54:00:8E:00:5A"
709-
memory = 2048
710-
}
711-
use_os_released_updates = false
712-
ssh_key_path = "./salt/controller/id_rsa.pub"
713-
}
714-
715-
module "ubuntu1604-sshminion" {
716-
source = "./modules/sshminion"
717-
base_configuration = module.base3.configuration
718-
product_version = "4.0-released"
719-
name = "minssh-ubuntu1604"
720-
image = "ubuntu1604o"
721-
provider_settings = {
722-
mac = "52:54:00:CE:FE:C8"
723-
memory = 2048
724-
}
725-
use_os_released_updates = false
726-
ssh_key_path = "./salt/controller/id_rsa.pub"
727-
}
683+
# module "ubuntu2004-sshminion" {
684+
# providers = {
685+
# libvirt = libvirt.classic181
686+
# }
687+
# source = "./modules/sshminion"
688+
# base_configuration = module.base3.configuration
689+
# product_version = "4.0-released"
690+
# name = "minssh-ubuntu2004"
691+
# image = "ubuntu2004o"
692+
# provider_settings = {
693+
# mac = "52:54:00:2A:47:D8"
694+
# memory = 2048
695+
# }
696+
# use_os_released_updates = false
697+
# ssh_key_path = "./salt/controller/id_rsa.pub"
698+
# }
699+
#
700+
# module "ubuntu1804-sshminion" {
701+
# providers = {
702+
# libvirt = libvirt.classic181
703+
# }
704+
# source = "./modules/sshminion"
705+
# base_configuration = module.base3.configuration
706+
# product_version = "4.0-released"
707+
# name = "minssh-ubuntu1804"
708+
# image = "ubuntu1804o"
709+
# provider_settings = {
710+
# mac = "52:54:00:8E:00:5A"
711+
# memory = 2048
712+
# }
713+
# use_os_released_updates = false
714+
# ssh_key_path = "./salt/controller/id_rsa.pub"
715+
# }
716+
#
717+
# module "ubuntu1604-sshminion" {
718+
# source = "./modules/sshminion"
719+
# base_configuration = module.base3.configuration
720+
# product_version = "4.0-released"
721+
# name = "minssh-ubuntu1604"
722+
# image = "ubuntu1604o"
723+
# provider_settings = {
724+
# mac = "52:54:00:CE:FE:C8"
725+
# memory = 2048
726+
# }
727+
# use_os_released_updates = false
728+
# ssh_key_path = "./salt/controller/id_rsa.pub"
729+
# }
728730

729731

730732
module "controller" {
731733
source = "./modules/controller"
732734
base_configuration = module.base.configuration
733735
name = "ctl"
736+
image = "sles15sp1"
734737
provider_settings = {
735738
mac = "52:54:00:B2:CF:9B"
736739
memory = 16384
@@ -777,14 +780,14 @@ module "controller" {
777780
sle15sp1_minion_configuration = module.sles15sp1-minion.configuration
778781
sle15sp1_sshminion_configuration = module.sles15sp1-sshminion.configuration
779782

780-
ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
781-
ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
782-
783-
ubuntu1804_minion_configuration = module.ubuntu1804-minion.configuration
784-
ubuntu1804_sshminion_configuration = module.ubuntu1804-sshminion.configuration
785-
786-
ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
787-
ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
783+
# ubuntu1604_minion_configuration = module.ubuntu1604-minion.configuration
784+
# ubuntu1604_sshminion_configuration = module.ubuntu1604-sshminion.configuration
785+
#
786+
# ubuntu1804_minion_configuration = module.ubuntu1804-minion.configuration
787+
# ubuntu1804_sshminion_configuration = module.ubuntu1804-sshminion.configuration
788+
#
789+
# ubuntu2004_minion_configuration = module.ubuntu2004-minion.configuration
790+
# ubuntu2004_sshminion_configuration = module.ubuntu2004-sshminion.configuration
788791
}
789792

790793
output "configuration" {

0 commit comments

Comments
 (0)