Skip to content

Commit 22ff903

Browse files
Remove berkshelf
Berkshelf is a dependency manager for Chef cookbooks. With it, you can depend on community cookbooks and include them in your workflow. Berkshelf is not useful when all cookbooks are local. ParallelCluster cookbook has all third party cookbooks ready locally. Reducing software we depend on improves stability of the product. (e.g we have one known issue related to berkshelf https://github.com/aws/aws-parallelcluster/wiki/(3.8.0-%E2%80%90-3.9.3)-ParallelCluster-Build-Image-Failing-during-Installation-of-Minitar-Ruby-Gem-Dependency) Signed-off-by: Hanwen <[email protected]>
1 parent 3997c92 commit 22ff903

File tree

20 files changed

+56
-220
lines changed

20 files changed

+56
-220
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.idea
33
*.iml
44
.vagrant
5-
Berksfile.lock
65
*~
76
*#
87
.#*

Berksfile

Lines changed: 0 additions & 24 deletions
This file was deleted.

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'berkshelf'
6-
75
group :style do
86
gem 'cookstyle', '~> 7.25.9'
97
gem 'rake', '~> 13.0.1'

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ This repo contains the AWS ParallelCluster Chef cookbook used in AWS ParallelClu
88

99
# Code structure
1010

11-
The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Berksfile` and `metadata.rb`.
12-
These files are used by the CLI (build image time) and `user-data.sh` code to [vendor](https://docs.chef.io/workstation/berkshelf/#berks-vendor)
13-
the other sub-cookbooks and third party cookbooks.
11+
The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Policyfile.rb` and `metadata.rb`.
12+
These files are used by the CLI (build image time) and `user-data.sh` code to vendor the other sub-cookbooks and third party cookbooks.
1413

1514
The main cookbook does not contain any recipe, attribute or library. They are distributed in the functional cookbooks under the `cookbooks` folder
1615
defined as follows:
@@ -391,13 +390,14 @@ If you interrupt it and try to run `kitchen verify`, you see authentication fail
391390
This happens because Ubuntu22 does not accept authentication via RSA key. You need to re-create a key pair
392391
using `ED25519` key type.
393392

394-
### Known issues with Berks
393+
### Known issues with Policyfiles
395394

396395
#### Kitchen doesn't see your changes
397396

398397
If Kitchen doesn't detect your changes, try
399398
```
400-
berks shelf uninstall ${COOKBOOK_NAME}
399+
chef install
400+
chef push kitchen
401401
```
402402

403403
## About python tests

cookbooks/aws-parallelcluster-awsbatch/Berksfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

cookbooks/aws-parallelcluster-computefleet/Berksfile

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
require 'chefspec'
2-
require 'chefspec/berkshelf'
32

43
require_relative '../../aws-parallelcluster-shared/spec/spec_helper'

cookbooks/aws-parallelcluster-entrypoints/Berksfile

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
require 'chefspec'
2-
require 'chefspec/berkshelf'
32

43
require_relative '../../aws-parallelcluster-shared/spec/spec_helper'

cookbooks/aws-parallelcluster-environment/Berksfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)