Skip to content

Commit fed0e54

Browse files
committed
Merge branch 'master' of github.com:zuazo/ssl_certificate-cookbook
Conflicts: .travis.yml
2 parents 5b0f72c + 95a0bde commit fed0e54

12 files changed

+314
-244
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### Cookbook Version
2+
[Version of the cookbook where you are encountering the issue]
3+
4+
### Chef Client Version
5+
[Version of chef-client in your environment]
6+
7+
### Platform Details
8+
[Operating system distribution and release version. Cloud provider if running in the cloud]
9+
10+
### Scenario
11+
[What you are trying to achieve and you can't?]
12+
13+
### Steps to Reproduce
14+
[If you are filing an issue what are the things we need to do in order to repro your problem? How are you using this cookbook or any resources it includes?]
15+
16+
### Expected Result
17+
[What are you expecting to happen as the consequence of above reproduction steps?]
18+
19+
### Actual Result
20+
[What actually happens after the reproduction steps? Include the error output or a link to a gist if possible.]

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
### Description
2+
3+
[Describe what this change achieves]
4+
5+
### Issues Resolved
6+
7+
[List any existing issues this PR resolves]
8+
9+
### Contribution Check List
10+
11+
- [ ] All tests pass.
12+
- [ ] New functionality includes testing.
13+
- [ ] New functionality has been documented in the README and metadata if applicable.
14+
15+
See [CONTRIBUTING.md](https://github.com/zuazo/ssl_certificate-cookbook/blob/master/CONTRIBUTING.md).

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@
55
Berksfile.lock
66
bin
77
bin/*
8+
.bundle
89
.bundle/*
910
.cache
11+
cookbooks
1012
/cookbooks
13+
coverage
1114
doc
15+
Dockerfile-kitchen*
16+
*.gem
1217
Gemfile.lock
1318
.kitchen
1419
.kitchen.local.yml
20+
metadata.json
21+
nodes/
1522
.*.sw[a-z]
1623
test/kitchen/.kitchen/
1724
*.un~

.kitchen.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ driver:
88
provisioner:
99
name: chef_solo
1010

11+
# Preparing for Chef 13
12+
client_rb:
13+
treat_deprecation_warnings_as_errors: true
14+
resource_cloning: false
15+
1116
platforms:
1217
- name: centos-5.11
1318
- name: centos-6.7

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ sudo: required
55
env:
66
- CHEF_VERSION="~> 12.0"
77

8-
before_install: gem install bundler # Update bundler
8+
before_install:
9+
- gem install bundler # Update bundler
10+
- gem update --system # https://github.com/sickill/rainbow/issues/48
911

1012
bundler_args: --jobs=3 --retry=3 --without='doc integration integration_docker integration_vagrant integration_cloud guard'
1113

12-
script:
13-
- bundle exec rake style unit
14+
script: travis_retry bundle exec rake style unit

0 commit comments

Comments
 (0)