Skip to content

converting to custom resources #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
317 changes: 212 additions & 105 deletions .kitchen.docker.yml → .kitchen.dokken.yml

Large diffs are not rendered by default.

376 changes: 220 additions & 156 deletions .kitchen.yml

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@ services: docker

env:
matrix:
- INSTANCE=service55-multi-centos-6
- INSTANCE=service55-multi-centos-7
- INSTANCE=service55-multi-ubuntu-1204
- INSTANCE=service55-multi-ubuntu-1404
- INSTANCE=service56-multi-centos-6
- INSTANCE=service56-multi-centos-7
- INSTANCE=service56-multi-fedora-latest
- INSTANCE=service56-multi-ubuntu-1404
- INSTANCE=service56-multi-opensuse-132
- INSTANCE=service56-multi-opensuse-421
- INSTANCE=service57-multi-centos-6
- INSTANCE=service57-multi-centos-7
- INSTANCE=service57-multi-fedora-latest
- INSTANCE=service57-multi-ubuntu-1604
- INSTANCE=smoke-centos-6
- INSTANCE=smoke-centos-7
- INSTANCE=smoke-fedora-latest
- INSTANCE=smoke-debian-8
- INSTANCE=smoke-ubuntu-1204
- INSTANCE=smoke-ubuntu-1404
- INSTANCE=smoke-ubuntu-1604
- INSTANCE=smoke-opensuse-132
- INSTANCE=smoke-opensuse-421

# Ensure we make ChefDK's Ruby the default
before_script:
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef gem install kitchen-dokken
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version

script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}

after_script:
- docker images
- docker ps -a
- cat .kitchen/logs/kitchen.log

matrix:
include:
- script: /opt/chefdk/embedded/bin/cookstyle
Expand Down
9 changes: 1 addition & 8 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'apt'
cookbook 'freebsd'
cookbook 'ips-omniti'
cookbook 'selinux'
cookbook 'mysql_client_test', path: 'test/fixtures/cookbooks/mysql_client_test'
cookbook 'mysql_config_test', path: 'test/fixtures/cookbooks/mysql_config_test'
cookbook 'mysql_replication_test', path: 'test/fixtures/cookbooks/mysql_replication_test'
cookbook 'mysql_service_test', path: 'test/fixtures/cookbooks/mysql_service_test'
cookbook 'mysql_test', path: 'test/cookbooks/mysql_test'
end
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This cookbook is concerned with the "MySQL Community Server", particularly those

## Requirements

- Chef 11 or higher
- Chef 12.5 or higher

This comment was marked as outdated.

- Network accessible package repositories
- 'recipe[selinux::disabled]' on RHEL platforms

Expand Down Expand Up @@ -48,15 +48,17 @@ The following platforms have been tested with Test Kitchen:

## Cookbook Dependencies

- yum-mysql-community
- smf
There are no hard coupled dependencies.
However, there is a loose dependency on `yum-mysql-community` for RHEL/Centos platforms.
As of the 8.0 version of this cookbook, configuration of the package repos is now the
responsibility of the user.

## Usage

Place a dependency on the mysql cookbook in your cookbook's metadata.rb

```ruby
depends 'mysql', '~> 7.0'
depends 'mysql', '~> 8.0'
```

Then, in a recipe:
Expand Down Expand Up @@ -275,7 +277,7 @@ mysql_client 'default' do
end
```

#### Parameters
#### Properties

- `package_name` - An array of packages to be installed. Defaults to a value looked up in an internal map.
- `package_version` - Specific versions of the package to install, passed onto the underlying package manager. Defaults to `nil`.
Expand Down Expand Up @@ -423,7 +425,7 @@ Please refer to the HACKING.md
- Author:: Jesse Howarth ([him@jessehowarth.com](mailto:him@jessehowarth.com))
- Author:: Andrew Crump ([andrew@kotirisoftware.com](mailto:andrew@kotirisoftware.com))
- Author:: Christoph Hartmann ([chris@lollyrock.com](mailto:chris@lollyrock.com))
- Author:: Sean OMeara ([sean@chef.io](mailto:sean@chef.io))
- Author:: Sean OMeara ([sean@chef.io](mailto:sean@sean.io))

```text
Copyright:: 2009-2014 Chef Software, Inc
Expand Down
Loading