Increment mysql cookbook version
- Bump mysql to 7.2 - Bump mysql2_chef_gem to 1.1.0 - Work around https://github.com/chef/chef-dk/issues/966 - fixes minor bug in postgres-server_spec and server_spec Change-Id: I6e906c5fad0360a7d9718fc5d5cda2983c3b768e Depends-On: I07ad79a93642d0f0c934a864fcb9bcd7b764e35f Implements: blueprint newton-xenial
This commit is contained in:
parent
57042a006e
commit
3a0d36aa5a
|
@ -23,8 +23,8 @@ end
|
|||
|
||||
depends 'mariadb', '~> 0.3.1'
|
||||
depends 'percona', '~> 0.16.1'
|
||||
depends 'mysql', '~> 6.0.13'
|
||||
depends 'mysql2_chef_gem', '~> 1.0.1'
|
||||
depends 'mysql', '~> 7.2.0'
|
||||
depends 'mysql2_chef_gem', '~> 1.1.0'
|
||||
depends 'postgresql', '~> 3.4.18'
|
||||
depends 'database', '~> 4.0.2'
|
||||
depends 'openstack-common', '>= 14.0.0'
|
||||
|
|
|
@ -28,6 +28,11 @@ mysql2_chef_gem 'default' do
|
|||
action :install
|
||||
end
|
||||
|
||||
# Note(frickler): Work around for https://github.com/chef/chef-dk/issues/966
|
||||
bash 'fix gem ext dir' do
|
||||
code "rmdir ~/.chefdk/gem/ruby/2.1.0/extensions && ln -s /opt/chefdk/embedded/lib/ruby/gems/2.1.0/extensions ~/.chefdk/gem/ruby/2.1.0/extensions || true"
|
||||
end
|
||||
|
||||
node['openstack']['db']['python_packages']['mysql'].each do |pkg|
|
||||
package pkg
|
||||
end
|
||||
|
|
|
@ -12,7 +12,7 @@ describe 'openstack-ops-database::postgresql-server' do
|
|||
# The postgresql cookbook will raise an 'uninitialized constant
|
||||
# Chef::Application' error without this attribute when running
|
||||
# the tests
|
||||
node.set_unless['postgresql']['password']['postgres'] = ''
|
||||
node.set['postgresql']['password']['postgres'] = 'postgres_password'
|
||||
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
|
|
|
@ -18,7 +18,7 @@ describe 'openstack-ops-database::server' do
|
|||
# The postgresql cookbook will raise an 'uninitialized constant
|
||||
# Chef::Application' error without this attribute when running
|
||||
# the tests
|
||||
node.set_unless['postgresql']['password']['postgres'] = ''
|
||||
node.set['postgresql']['password']['postgres'] = 'postgres_password'
|
||||
|
||||
expect(chef_run).to include_recipe(
|
||||
'openstack-ops-database::postgresql-server')
|
||||
|
|
Loading…
Reference in New Issue