Skip to content

Commit 44e558b

Browse files
dirkmuellerdirkmueller
committed
Allow Cloud8 with SP4
1 parent e06d680 commit 44e558b

6 files changed

Lines changed: 90 additions & 65 deletions

File tree

‎chef/data_bags/crowbar/template-provisioner.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,28 @@
140140
"append": " "
141141
}
142142
},
143+
"suse-12.4": {
144+
"aarch64": {
145+
"initrd": "boot/aarch64/initrd",
146+
"kernel": "boot/aarch64/linux",
147+
"append": " "
148+
},
149+
"x86_64": {
150+
"initrd": "boot/x86_64/loader/initrd",
151+
"kernel": "boot/x86_64/loader/linux",
152+
"append": " "
153+
},
154+
"ppc64le": {
155+
"initrd": "boot/ppc64le/initrd",
156+
"kernel": "boot/ppc64le/linux",
157+
"append": " "
158+
},
159+
"s390x": {
160+
"initrd": "boot/s390x/initrd",
161+
"kernel": "boot/s390x/linux",
162+
"append": " "
163+
}
164+
},
143165
"opensuse-42.1": {
144166
"x86_64": {
145167
"initrd": "boot/x86_64/loader/initrd",

‎crowbar_framework/config/repos-cloud.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
---
2-
suse-12.3:
2+
suse-12.4:
33
aarch64:
4-
sles12-sp3-pool:
5-
name: "SLES12-SP3-Pool"
4+
sles12-sp4-pool:
5+
name: "SLES12-SP4-Pool"
66
required: "mandatory"
77
features: ["os"]
88
repomd:
9-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/SLES/12.3/POOL/aarch64"
9+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/SLES/12.4/POOL/aarch64"
1010
url:
11-
smt_path: "SUSE/Products/SLE-SERVER/12-SP3/aarch64/product"
11+
smt_path: "SUSE/Products/SLE-SERVER/12-SP4/aarch64/product"
1212
ask_on_error: false
13-
sles12-sp3-updates:
14-
name: "SLES12-SP3-Updates"
13+
sles12-sp4-updates:
14+
name: "SLES12-SP4-Updates"
1515
required: "mandatory"
1616
features: ["os"]
1717
repomd:
18-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP3:aarch64/update"
18+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP4:aarch64/update"
1919
url:
20-
smt_path: "SUSE/Updates/SLE-SERVER/12-SP3/aarch64/update"
20+
smt_path: "SUSE/Updates/SLE-SERVER/12-SP4/aarch64/update"
2121
ask_on_error: false
2222
cloud:
2323
name: "Cloud"
@@ -50,32 +50,32 @@ suse-12.3:
5050
url:
5151
smt_path: "SUSE/Updates/OpenStack-Cloud-Crowbar/8/aarch64/update"
5252
ask_on_error: false
53-
sle12-sp3-ha-pool:
54-
name: "SLE12-SP3-HA-Pool"
53+
sle12-sp4-ha-pool:
54+
name: "SLE12-SP4-HA-Pool"
5555
required: "optional"
5656
features: ["ha"]
5757
repomd:
58-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/sle-ha/12.3/POOL/aarch64"
58+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/sle-ha/12.4/POOL/aarch64"
5959
fingerprint: ""
6060
url:
61-
smt_path: "SUSE/Products/SLE-HA/12-SP3/aarch64/product"
61+
smt_path: "SUSE/Products/SLE-HA/12-SP4/aarch64/product"
6262
ask_on_error: false
63-
sle12-sp3-ha-updates:
64-
name: "SLE12-SP3-HA-Updates"
63+
sle12-sp4-ha-updates:
64+
name: "SLE12-SP4-HA-Updates"
6565
required: "optional"
6666
features: ["ha"]
6767
repomd:
68-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP3:aarch64/update"
68+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP4:aarch64/update"
6969
fingerprint: ""
7070
url:
71-
smt_path: "SUSE/Updates/SLE-HA/12-SP3/aarch64/update"
71+
smt_path: "SUSE/Updates/SLE-HA/12-SP4/aarch64/update"
7272
ask_on_error: false
7373
suse-enterprise-storage-5-pool:
7474
name: "SUSE-Enterprise-Storage-5-Pool"
7575
required: "optional"
7676
features: ["ceph"]
7777
repomd:
78-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:Update:Products:SES5/ses/5/POOL/aarch64"
78+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:Update:Products:SES5/ses/5/POOL/aarch64"
7979
fingerprint: "FEAB 5025 39D8 46DB 2C09 61CA 70AF 9E81 39DB 7C82"
8080
url:
8181
smt_path: "SUSE/Products/Storage/5/aarch64/product"
@@ -96,25 +96,25 @@ suse-12.3:
9696
url:
9797
ask_on_error: false
9898
x86_64:
99-
sles12-sp3-pool:
100-
name: "SLES12-SP3-Pool"
99+
sles12-sp4-pool:
100+
name: "SLES12-SP4-Pool"
101101
required: "mandatory"
102102
features: ["os"]
103103
repomd:
104-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/SLES/12.3/POOL/x86_64"
104+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/SLES/12.4/POOL/x86_64"
105105
fingerprint: ""
106106
url:
107-
smt_path: "SUSE/Products/SLE-SERVER/12-SP3/x86_64/product"
107+
smt_path: "SUSE/Products/SLE-SERVER/12-SP4/x86_64/product"
108108
ask_on_error: false
109-
sles12-sp3-updates:
110-
name: "SLES12-SP3-Updates"
109+
sles12-sp4-updates:
110+
name: "SLES12-SP4-Updates"
111111
required: "mandatory"
112112
features: ["os"]
113113
repomd:
114-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP3:x86_64/update"
114+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP4:x86_64/update"
115115
fingerprint: ""
116116
url:
117-
smt_path: "SUSE/Updates/SLE-SERVER/12-SP3/x86_64/update"
117+
smt_path: "SUSE/Updates/SLE-SERVER/12-SP4/x86_64/update"
118118
ask_on_error: false
119119
cloud:
120120
name: "Cloud"
@@ -147,32 +147,32 @@ suse-12.3:
147147
url:
148148
smt_path: "SUSE/Updates/OpenStack-Cloud-Crowbar/8/x86_64/update"
149149
ask_on_error: false
150-
sle12-sp3-ha-pool:
151-
name: "SLE12-SP3-HA-Pool"
150+
sle12-sp4-ha-pool:
151+
name: "SLE12-SP4-HA-Pool"
152152
required: "optional"
153153
features: ["ha"]
154154
repomd:
155-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/sle-ha/12.3/POOL/x86_64"
155+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/sle-ha/12.4/POOL/x86_64"
156156
fingerprint: ""
157157
url:
158-
smt_path: "SUSE/Products/SLE-HA/12-SP3/x86_64/product"
158+
smt_path: "SUSE/Products/SLE-HA/12-SP4/x86_64/product"
159159
ask_on_error: false
160-
sle12-sp3-ha-updates:
161-
name: "SLE12-SP3-HA-Updates"
160+
sle12-sp4-ha-updates:
161+
name: "SLE12-SP4-HA-Updates"
162162
required: "optional"
163163
features: ["ha"]
164164
repomd:
165-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP3:x86_64/update"
165+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP4:x86_64/update"
166166
fingerprint: ""
167167
url:
168-
smt_path: "SUSE/Updates/SLE-HA/12-SP3/x86_64/update"
168+
smt_path: "SUSE/Updates/SLE-HA/12-SP4/x86_64/update"
169169
ask_on_error: false
170170
suse-enterprise-storage-5-pool:
171171
name: "SUSE-Enterprise-Storage-5-Pool"
172172
required: "optional"
173173
features: ["ceph"]
174174
repomd:
175-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:Update:Products:SES5/ses/5/POOL/x86_64"
175+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:Update:Products:SES5/ses/5/POOL/x86_64"
176176
fingerprint: "FEAB 5025 39D8 46DB 2C09 61CA 70AF 9E81 39DB 7C82"
177177
url:
178178
smt_path: "SUSE/Products/Storage/5/x86_64/product"
@@ -192,25 +192,25 @@ suse-12.3:
192192
url:
193193
ask_on_error: false
194194
s390x:
195-
sles12-sp3-pool:
196-
name: "SLES12-SP3-Pool"
195+
sles12-sp4-pool:
196+
name: "SLES12-SP4-Pool"
197197
required: "optional"
198198
features: ["os"]
199199
repomd:
200-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/SLES/12.3/POOL/s390x"
200+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/SLES/12.4/POOL/s390x"
201201
fingerprint: ""
202202
url:
203-
smt_path: "SUSE/Products/SLE-SERVER/12-SP3/s390x/product"
203+
smt_path: "SUSE/Products/SLE-SERVER/12-SP4/s390x/product"
204204
ask_on_error: false
205-
sles12-sp3-updates:
206-
name: "SLES12-SP3-Updates"
205+
sles12-sp4-updates:
206+
name: "SLES12-SP4-Updates"
207207
required: "optional"
208208
features: ["os"]
209209
repomd:
210-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP3:s390x/update"
210+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-SERVER:12-SP4:s390x/update"
211211
fingerprint: ""
212212
url:
213-
smt_path: "SUSE/Updates/SLE-SERVER/12-SP3/s390x/update"
213+
smt_path: "SUSE/Updates/SLE-SERVER/12-SP4/s390x/update"
214214
ask_on_error: false
215215
cloud:
216216
name: "Cloud"
@@ -248,23 +248,23 @@ suse-12.3:
248248
url:
249249
smt_path: "SUSE/Updates/OpenStack-Cloud-Crowbar/8/s390x/update"
250250
ask_on_error: false
251-
sle12-sp3-ha-pool:
252-
name: "SLE12-SP3-HA-Pool"
251+
sle12-sp4-ha-pool:
252+
name: "SLE12-SP4-HA-Pool"
253253
required: "optional"
254254
features: ["ha"]
255255
repomd:
256-
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP3:GA/sle-ha/12.3/POOL/s390x"
256+
tag: "obsproduct://build.suse.de/SUSE:SLE-12-SP4:GA/sle-ha/12.4/POOL/s390x"
257257
fingerprint: ""
258258
url:
259-
smt_path: "SUSE/Products/SLE-HA/12-SP3/s390x/product"
259+
smt_path: "SUSE/Products/SLE-HA/12-SP4/s390x/product"
260260
ask_on_error: false
261-
sle12-sp3-ha-updates:
262-
name: "SLE12-SP3-HA-Updates"
261+
sle12-sp4-ha-updates:
262+
name: "SLE12-SP4-HA-Updates"
263263
required: "optional"
264264
features: ["ha"]
265265
repomd:
266-
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP3:s390x/update"
266+
tag: "obsrepository://build.suse.de/SUSE:Updates:SLE-HA:12-SP4:s390x/update"
267267
fingerprint: ""
268268
url:
269-
smt_path: "SUSE/Updates/SLE-HA/12-SP3/s390x/update"
269+
smt_path: "SUSE/Updates/SLE-HA/12-SP4/s390x/update"
270270
ask_on_error: false

‎crowbar_framework/lib/crowbar/platform.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class Platform
1919
class << self
2020
def pretty_target_platform(target_platform)
2121
return "openSUSE Leap 42.1" if target_platform == "opensuse-42.1"
22+
return "SLES 12 SP4" if target_platform == "suse-12.4"
2223
return "SLES 12 SP3" if target_platform == "suse-12.3"
2324
return "SLES 12 SP2" if target_platform == "suse-12.2"
2425
return "SLES 12 SP1" if target_platform == "suse-12.1"
@@ -46,6 +47,7 @@ def require_license_platforms
4647
def support_software_raid
4748
[
4849
"opensuse-42.1",
50+
"suse-12.4",
4951
"suse-12.3",
5052
"suse-12.2",
5153
"suse-12.1",
@@ -58,6 +60,7 @@ def support_software_raid
5860
def support_default_fs
5961
[
6062
"opensuse-42.1",
63+
"suse-12.4",
6164
"suse-12.3",
6265
"suse-12.2",
6366
"suse-12.1",

‎crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
receive(:all).and_return([Node.find_by_name("testing.crowbar.com")])
195195
)
196196
allow(Api::Upgrade).to(
197-
receive(:target_platform).and_return("suse-12.3")
197+
receive(:target_platform).and_return("suse-12.4")
198198
)
199199
allow(Api::Node).to(
200200
receive(:node_architectures).and_return(
@@ -210,7 +210,7 @@
210210
["os", "ceph", "ha", "openstack"].each do |feature|
211211
allow(::Crowbar::Repository).to(
212212
receive(:provided_and_enabled_with_repolist).with(
213-
feature, "suse-12.3", "x86_64"
213+
feature, "suse-12.4", "x86_64"
214214
).and_return([true, {}])
215215
)
216216
end

‎crowbar_framework/spec/models/api/node_spec.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
let!(:os_repo_missing) do
1919
allow(::Crowbar::Repository).to(
2020
receive(:provided_and_enabled_with_repolist).with(
21-
"os", "suse-12.3", "x86_64"
21+
"os", "suse-12.4", "x86_64"
2222
).and_return(
2323
[
2424
false,
2525
{
2626
"missing" => {
2727
"x86_64" => [
28-
"SLES12-SP3-Pool",
29-
"SLES12-SP3-Updates"
28+
"SLES12-SP4-Pool",
29+
"SLES12-SP4-Updates"
3030
]
3131
},
3232
"inactive" => {
3333
"x86_64" => [
34-
"SLES12-SP3-Pool",
35-
"SLES12-SP3-Updates"
34+
"SLES12-SP4-Pool",
35+
"SLES12-SP4-Updates"
3636
]
3737
}
3838
}
@@ -43,7 +43,7 @@
4343
let!(:openstack_repo_missing) do
4444
allow(::Crowbar::Repository).to(
4545
receive(:provided_and_enabled_with_repolist).with(
46-
"openstack", "suse-12.3", "x86_64"
46+
"openstack", "suse-12.4", "x86_64"
4747
).and_return(
4848
[
4949
false,
@@ -70,7 +70,7 @@
7070

7171
before(:each) do
7272
allow(Api::Upgrade).to(
73-
receive(:target_platform).and_return("suse-12.3")
73+
receive(:target_platform).and_return("suse-12.4")
7474
)
7575
allow(Api::Node).to(
7676
receive(:node_architectures).and_return(
@@ -89,7 +89,7 @@
8989
it "finds the os repositories required to upgrade the nodes" do
9090
allow(::Crowbar::Repository).to(
9191
receive(:provided_and_enabled_with_repolist).with(
92-
"os", "suse-12.3", "x86_64"
92+
"os", "suse-12.4", "x86_64"
9393
).and_return([true, {}])
9494
)
9595
allow_any_instance_of(ProvisionerService).to receive(:enable_repository).and_return(true)
@@ -108,7 +108,7 @@
108108
["os", "ceph", "ha", "openstack"].each do |feature|
109109
allow(::Crowbar::Repository).to(
110110
receive(:provided_and_enabled_with_repolist).with(
111-
feature, "suse-12.3", "x86_64"
111+
feature, "suse-12.4", "x86_64"
112112
).and_return([true, {}])
113113
)
114114

@@ -141,7 +141,7 @@
141141
it "finds any node with the ceph addon deployed" do
142142
allow(::Crowbar::Repository).to(
143143
receive(:provided_and_enabled_with_repolist).with(
144-
"ceph", "suse-12.3", "x86_64"
144+
"ceph", "suse-12.4", "x86_64"
145145
).and_return([true, {}])
146146
)
147147
allow_any_instance_of(ProvisionerService).to receive(:enable_repository).and_return(true)

‎crowbar_framework/spec/models/api/upgrade_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373
receive(:all).and_return([Node.find_by_name("testing.crowbar.com")])
7474
)
7575
allow(Api::Upgrade).to(
76-
receive(:target_platform).and_return("suse-12.3")
76+
receive(:target_platform).and_return("suse-12.4")
7777
)
7878
allow(::Crowbar::Repository).to(
7979
receive(:provided_and_enabled?).and_return(true)
8080
)
8181
["os", "ceph", "ha", "openstack"].each do |feature|
8282
allow(::Crowbar::Repository).to(
8383
receive(:provided_and_enabled_with_repolist).with(
84-
feature, "suse-12.3", "x86_64"
84+
feature, "suse-12.4", "x86_64"
8585
).and_return([true, {}])
8686
)
8787
end

0 commit comments

Comments
 (0)