Skip to content

Commit c199411

Browse files
Revert "Use add_package_repository helper to setup neuron repository"
This reverts commit a161fef.
1 parent ab769ab commit c199411

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

cookbooks/aws-parallelcluster-install/recipes/neuron.rb

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,26 @@
2222
return if is_package_installed?("aws-neuronx-dkms") || is_package_installed?("aws-neuron-dkms")
2323

2424
# add neuron repository
25-
add_package_repository('neuron', node['cluster']['neuron']['base_url'], node['cluster']['neuron']['public_key'], 'focal', ['main'])
25+
if platform?('amazon')
26+
yum_repository "neuron" do
27+
description "Neuron YUM Repository"
28+
baseurl node['cluster']['neuron']['base_url']
29+
gpgkey node['cluster']['neuron']['public_key']
30+
retries 3
31+
retry_delay 5
32+
end
33+
34+
elsif platform?('ubuntu')
35+
apt_repository 'neuron' do
36+
uri node['cluster']['neuron']['base_url']
37+
components ['main']
38+
key node['cluster']['neuron']['public_key']
39+
retries 3
40+
retry_delay 5
41+
end
42+
43+
apt_update
44+
end
2645

2746
package node['cluster']['neuron']['packages'] do
2847
retries 10

libraries/helpers.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def chrony_reload_command
355355

356356
# Add an external package repository to the OS's package manager
357357
# NOTE: This helper function defines a Chef resource function to be executed at Converge time
358-
def add_package_repository(repo_name, baseurl, gpgkey, distribution, components = [])
358+
def add_package_repository(repo_name, baseurl, gpgkey, distribution)
359359
case node['platform_family']
360360
when 'rhel', 'amazon'
361361
yum_repository repo_name do
@@ -369,7 +369,6 @@ def add_package_repository(repo_name, baseurl, gpgkey, distribution, components
369369
uri baseurl
370370
key gpgkey
371371
distribution distribution
372-
components components
373372
retries 3
374373
retry_delay 5
375374
end

0 commit comments

Comments
 (0)