Skip to content

Commit

Permalink
Relax database cookbook constraint.
Browse files Browse the repository at this point in the history
  • Loading branch information
patcon committed Jul 5, 2015
1 parent a4c41a5 commit 5bdd7ab
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
depends 'apache2'
depends 'ark'
depends 'cron'
depends 'database', '= 2.3.1'
depends 'database'
depends 'git'
depends 'java'
depends 'mysql', '~> 5.0'
depends 'mysql2_chef_gem'
depends 'mysql_connector'
depends 'perl'
depends 'postgresql'
6 changes: 5 additions & 1 deletion recipes/database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
case settings['database']['type']
when 'mysql'
include_recipe 'mysql::server'
include_recipe 'database::mysql'

mysql2_chef_gem 'default' do
action :install
end

database_connection.merge!(:username => 'root', :password => node['mysql']['server_root_password'])

mysql_database settings['database']['name'] do
Expand Down

0 comments on commit 5bdd7ab

Please sign in to comment.