Skip to content

Commit 01c8774

Browse files
committed
Update Test Naica setup
1 parent 1796b5f commit 01c8774

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

terracumber_config/tf_files/SUSEManager-Test-Naica-NUE.tf

+20-17
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ terraform {
8585
}
8686

8787
provider "libvirt" {
88-
uri = "qemu+tcp://cthulhu.mgr.suse.de/system"
88+
//uri = "qemu+tcp://cthulhu.mgr.suse.de/system"
89+
uri = "qemu+tcp://suma-04.mgr.suse.de/system"
8990
}
9091

9192
module "cucumber_testsuite" {
@@ -102,7 +103,7 @@ module "cucumber_testsuite" {
102103
cc_username = var.SCC_USER
103104
cc_password = var.SCC_PASSWORD
104105

105-
images = ["centos7o", "opensuse154o", "sles15sp4o", "ubuntu2204o"]
106+
images = ["centos7o", "rocky8o", "opensuse154o", "opensuse155o" , "sles15sp4o", "ubuntu2204o"]
106107

107108
use_avahi = false
108109
name_prefix = "suma-testnaica-"
@@ -122,35 +123,30 @@ module "cucumber_testsuite" {
122123
controller = {
123124
provider_settings = {
124125
mac = "aa:b2:93:01:00:60"
126+
vcpu = 2
127+
memory = 2048
125128
}
126129
}
127130
server = {
128131
provider_settings = {
129132
mac = "aa:b2:93:01:00:61"
133+
memory = 16384
130134
}
131-
/* TODO: needs to be upgraded to openSUSE_Leap_15.4?
132-
additional_repos = {
133-
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Naica/openSUSE_Leap_15.3/"
134-
}
135-
*/
136135
}
137-
/*
138136
proxy = {
139137
provider_settings = {
140138
mac = "aa:b2:93:01:00:62"
141139
}
142-
additional_repos = {
143-
Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Naica/openSUSE_Leap_15.3/"
144-
}
145140
additional_packages = [ "venv-salt-minion" ]
146141
install_salt_bundle = true
147142
}
148-
*/
149143
suse-client = {
150144
image = "sles15sp4o"
151145
name = "cli-sles15"
152146
provider_settings = {
153147
mac = "aa:b2:93:01:00:64"
148+
vcpu = 2
149+
memory = 2048
154150
}
155151
additional_packages = [ "venv-salt-minion" ]
156152
install_salt_bundle = true
@@ -160,6 +156,8 @@ module "cucumber_testsuite" {
160156
name = "min-sles15"
161157
provider_settings = {
162158
mac = "aa:b2:93:01:00:66"
159+
vcpu = 2
160+
memory = 2048
163161
}
164162
additional_packages = [ "venv-salt-minion" ]
165163
install_salt_bundle = true
@@ -169,12 +167,15 @@ module "cucumber_testsuite" {
169167
name = "minssh-sles15"
170168
provider_settings = {
171169
mac = "aa:b2:93:01:00:68"
170+
vcpu = 2
171+
memory = 2048
172172
}
173-
additional_packages = [ "venv-salt-minion" ]
173+
additional_packages = [ "venv-salt-minion", "iptables" ]
174174
install_salt_bundle = true
175175
}
176176
redhat-minion = {
177177
image = "centos7o"
178+
name = "min-centos7"
178179
provider_settings = {
179180
mac = "aa:b2:93:01:00:69"
180181
// Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM
@@ -190,6 +191,8 @@ module "cucumber_testsuite" {
190191
image = "ubuntu2204o"
191192
provider_settings = {
192193
mac = "aa:b2:93:01:00:6b"
194+
vcpu = 2
195+
memory = 2048
193196
}
194197
additional_packages = [ "venv-salt-minion" ]
195198
install_salt_bundle = true
@@ -200,16 +203,16 @@ module "cucumber_testsuite" {
200203
provider_settings = {
201204
mac = "aa:b2:93:01:00:6d"
202205
memory = 2048
206+
vcpu = 2
203207
}
204208
additional_packages = [ "venv-salt-minion" ]
205209
install_salt_bundle = true
206210
}
207211
}
208212
provider_settings = {
209-
pool = "ssd"
210-
network_name = null
211-
bridge = "br0"
212-
additional_network = "192.168.142.0/24"
213+
pool = "ssd"
214+
network_name = null
215+
bridge = "br0"
213216
}
214217
}
215218

0 commit comments

Comments
 (0)