Skip to content

Commit 216760e

Browse files
committed
Upgrade nfs third-party cookbook to version nfs-5.1.2 (from nfs-5.0.0)
Version 5.0.1 introduced support for Ubuntu22, anyway we weren't able to upgrade the package because nfs-utils `1:2.6.1-1ubuntu1.2` wasn't correctly supported. I created a patch for nfs cookbook to fix this incompatibility issue with nfs-utils. This has been released, so we can now upgrade to 5.1.x and remove the `ubuntu.22.json` file. ### References * https://github.com/sous-chefs/nfs/releases * sous-chefs/nfs#142 * https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1971935 Signed-off-by: Enrico Usai <[email protected]>
1 parent c03e02b commit 216760e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+315
-5122
lines changed

Berksfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata
1010
cookbook "apt", path: "./cookbooks/third-party/apt-7.5.14"
1111
cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0"
1212
cookbook "line", path: "./cookbooks/third-party/line-4.5.13"
13-
cookbook "nfs", path: "./cookbooks/third-party/nfs-5.0.0"
13+
cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.2"
1414
cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.3"
1515
cookbook "pyenv", path: "./cookbooks/third-party/pyenv-4.2.3"
1616
cookbook "selinux", path: "./cookbooks/third-party/selinux-6.1.12"

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ aws-parallelcluster-cookbook CHANGELOG
33

44
This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
55

6+
3.9.0
7+
------
8+
9+
**ENHANCEMENTS**
10+
11+
**CHANGES**
12+
- Upgrade third-party cookbook dependencies:
13+
- nfs-5.1.2 (from nfs-5.0.0)
14+
15+
**BUG FIXES**
16+
617
3.8.0
718
------
819

cookbooks/aws-parallelcluster-awsbatch/Berksfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
1515
cookbook "apt", path: "../third-party/apt-7.5.14"
1616
cookbook "iptables", path: "../third-party/iptables-8.0.0"
1717
cookbook "line", path: "../third-party/line-4.5.13"
18-
cookbook "nfs", path: "../third-party/nfs-5.0.0"
18+
cookbook "nfs", path: "../third-party/nfs-5.1.2"
1919
cookbook "openssh", path: "../third-party/openssh-2.11.3"
2020
cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
2121
cookbook "selinux", path: "../third-party/selinux-6.1.12"

cookbooks/aws-parallelcluster-awsbatch/metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
depends 'apt', '~> 7.5.14'
1717
depends 'iptables', '~> 8.0.0'
18-
depends 'nfs', '~> 5.0.0'
18+
depends 'nfs', '~> 5.1.2'
1919
depends 'line', '~> 4.5.13'
2020
depends 'openssh', '~> 2.11.3'
2121
depends 'pyenv', '~> 4.2.3'

cookbooks/aws-parallelcluster-entrypoints/Berksfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
1212
cookbook "apt", path: "../third-party/apt-7.5.14"
1313
cookbook "iptables", path: "../third-party/iptables-8.0.0"
1414
cookbook "line", path: "../third-party/line-4.5.13"
15-
cookbook "nfs", path: "../third-party/nfs-5.0.0"
15+
cookbook "nfs", path: "../third-party/nfs-5.1.2"
1616
cookbook "openssh", path: "../third-party/openssh-2.11.3"
1717
cookbook "pyenv", path: "../third-party/pyenv-4.2.3"
1818
cookbook "selinux", path: "../third-party/selinux-6.1.12"

cookbooks/aws-parallelcluster-environment/Berksfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata
44

55
cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
66

7-
cookbook "nfs", path: "../third-party/nfs-5.0.0"
7+
cookbook "nfs", path: "../third-party/nfs-5.1.2"
88

99
# dependency od nfs
1010
cookbook "line", path: "../third-party/line-4.5.13"

cookbooks/aws-parallelcluster-environment/metadata.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
supports 'redhat', '= 8.7'
1616

1717
depends 'line', '~> 4.5.13'
18-
depends 'nfs', '~> 5.0.0'
18+
depends 'nfs', '~> 5.1.2'
1919

2020
depends 'aws-parallelcluster-shared', '~> 3.9.0'

cookbooks/aws-parallelcluster-shared/spec/spec_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def for_all_oses
4949
end
5050

5151
def runner(platform:, version:, step_into: [])
52-
path = '../aws-parallelcluster-shared/spec/ubuntu.22.json' if "#{platform}#{version}" == 'ubuntu22.04'
5352
ChefSpec::SoloRunner.new(
5453
platform: platform, version: version, step_into: step_into, path: path
5554
) do |node|

0 commit comments

Comments
 (0)