Skip to content

Commit c1e394a

Browse files
author
Sean Smith
committed
Revert "Use Local Cookbooks"
This reverts commit 3967fef. Signed-off-by: Sean Smith <[email protected]>
1 parent efbc57a commit c1e394a

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

Berksfile

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
11
source 'https://supermarket.chef.io'
22

3-
cookbook 'apt', path: '/etc/chef/cookbooks/apt'
4-
cookbook 'build-essential', path: '/etc/chef/cookbooks/build-essential'
5-
cookbook 'hostname', path: '/etc/chef/cookbooks/hostname'
6-
cookbook 'hostsfile', path: '/etc/chef/cookbooks/hostsfile'
7-
cookbook 'iptables', path: '/etc/chef/cookbooks/iptables'
8-
cookbook 'line', path: '/etc/chef/cookbooks/line'
9-
cookbook 'mingw', path: '/etc/chef/cookbooks/mingw'
10-
cookbook 'nfs', path: '/etc/chef/cookbooks/nfs'
11-
cookbook 'ohai', path: '/etc/chef/cookbooks/ohai'
12-
cookbook 'openssh', path: '/etc/chef/cookbooks/openssh'
13-
cookbook 'poise', path: '/etc/chef/cookbooks/poise'
14-
cookbook 'poise-archive', path: '/etc/chef/cookbooks/poise-archive'
15-
cookbook 'poise-languages', path: '/etc/chef/cookbooks/poise-languages'
16-
cookbook 'poise-python', path: '/etc/chef/cookbooks/poise-python'
17-
cookbook 'selinux', path: '/etc/chef/cookbooks/selinux'
18-
cookbook 'seven_zip', path: '/etc/chef/cookbooks/seven_zip'
19-
cookbook 'sysctl', path: '/etc/chef/cookbooks/sysctl'
20-
cookbook 'tar', path: '/etc/chef/cookbooks/tar'
21-
cookbook 'windows', path: '/etc/chef/cookbooks/windows'
22-
cookbook 'yum', path: '/etc/chef/cookbooks/yum'
23-
cookbook 'yum-epel', path: '/etc/chef/cookbooks/yum-epel'
3+
metadata

Berksfile_ami

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

amis/build_ami.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ do_command() {
153153
RC=0
154154

155155
rm -rf "${VENDOR_PATH}" || RC=1
156-
berks vendor "${VENDOR_PATH}" --berksfile "${cwd}/../Berksfile_ami" || RC=1
156+
berks vendor "${VENDOR_PATH}" --berksfile "${cwd}/../Berksfile" || RC=1
157157
if [ "x${_build_date}" == "x" ]; then
158158
export BUILD_DATE=$(date +%Y%m%d%H%M)
159159
else

0 commit comments

Comments
 (0)