Skip to content

Commit d4e7526

Browse files
davpratgmarciani
authored andcommitted
Point MySQL package download URL to public S3
Signed-off-by: David Pratt <[email protected]>
1 parent fbd53bd commit d4e7526

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

attributes/default.rb

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
'default' => 'gdrcopy'
228228
)
229229

230-
# MySQL
230+
# MySQL Repository Definitions
231231
default['cluster']['mysql']['repository']['definition']['file-name'] = value_for_platform(
232232
'default' => "mysql80-community-release-el7-7.noarch.rpm",
233233
'ubuntu' => { 'default' => "mysql-apt-config_0.8.23-1_all.deb" }
@@ -239,24 +239,23 @@
239239
'ubuntu' => { 'default' => "c2b410031867dc7c966ca5b1aa0c72aa" }
240240
)
241241

242-
243-
default['cluster']['mysql']['package']['url'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives"
244-
default['cluster']['mysql']['package']['root'] = "https://aws-parallelcluster-dev-commercial.s3.amazonaws.com/archives/mysql"
242+
# MySQL Packages
243+
default['cluster']['mysql']['package']['root'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives/mysql"
245244
default['cluster']['mysql']['package']['version'] = "8.0.31-1"
246245
default['cluster']['mysql']['package']['source-version'] = "8.0.31"
247-
if arm_instance?
248-
default['cluster']['mysql']['package']['platform'] = value_for_platform(
249-
'default' => "el/7/aarch64"
250-
)
251-
else
252-
default['cluster']['mysql']['package']['platform'] = value_for_platform(
253-
'default' => "el/7/x86_64",
254-
'ubuntu' => {
255-
'20.04' => "ubuntu/20.04/x86_64",
256-
'18.04' => "ubuntu/18.04/x86_64"
257-
}
258-
)
259-
end
246+
default['cluster']['mysql']['package']['platform'] = if arm_instance?
247+
value_for_platform(
248+
'default' => "el/7/aarch64"
249+
)
250+
else
251+
value_for_platform(
252+
'default' => "el/7/x86_64",
253+
'ubuntu' => {
254+
'20.04' => "ubuntu/20.04/x86_64",
255+
'18.04' => "ubuntu/18.04/x86_64",
256+
}
257+
)
258+
end
260259
default['cluster']['mysql']['package']['file-name'] = "mysql-community-client-#{node['cluster']['mysql']['package']['version']}.tar.gz"
261260
default['cluster']['mysql']['package']['archive'] = "#{node['cluster']['mysql']['package']['root']}/#{node['cluster']['mysql']['package']['platform']}/#{node['cluster']['mysql']['package']['file-name']}"
262261
default['cluster']['mysql']['package']['source'] = "#{node['cluster']['mysql']['package']['root']}/source/mysql-#{node['cluster']['mysql']['package']['source-version']}.tar.gz"
@@ -274,7 +273,7 @@
274273
'default' => "8.0.31",
275274
'ubuntu' => {
276275
'20.04' => "8.0.30-0ubuntu0.20.04.2",
277-
'18.04' => "5.7.39-0ubuntu0.18.04.2"
276+
'18.04' => "5.7.39-0ubuntu0.18.04.2",
278277
}
279278
)
280279
else
@@ -286,13 +285,11 @@
286285
'default' => "8.0.31",
287286
'ubuntu' => {
288287
'20.04' => "8.0.31-1ubuntu20.04",
289-
'18.04' => "8.0.31-1ubuntu18.04"
288+
'18.04' => "8.0.31-1ubuntu18.04",
290289
}
291290
)
292291
end
293292

294-
295-
296293
# EFA
297294
default['cluster']['efa']['installer_version'] = '1.18.0'
298295
default['cluster']['efa']['installer_url'] = "https://efa-installer.amazonaws.com/aws-efa-installer-#{node['cluster']['efa']['installer_version']}.tar.gz"

0 commit comments

Comments
 (0)