starting rocky development patch

Change-Id: If050a2d628edce724031bb19deb45f196ceb4a66
This commit is contained in:
Samuel Cassiba 2018-08-03 06:28:22 -07:00
parent 2fd2b86adb
commit e302e88e25
6 changed files with 21 additions and 6 deletions

View File

@ -1,3 +1,5 @@
inherit_from: .rubocop_todo.yml
AllCops:
Include:
- metadata.rb

13
.rubocop_todo.yml Normal file
View File

@ -0,0 +1,13 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2018-08-03 05:26:07 -0700 using RuboCop version 0.55.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 28
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 113

View File

@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache-2.0'
description 'Provides the shared database configuration for OpenStack'
version '17.0.0'
version '18.0.0'
recipe 'client', 'Installs client packages for the database used by the deployment.'
recipe 'server', 'Installs and configures server packages for the database used by the deployment.'
@ -19,7 +19,7 @@ recipe 'openstack-db', 'Creates necessary tables, users, and grants for OpenStac
supports os
end
depends 'openstack-common', '>= 17.0.0'
depends 'openstack-common', '>= 18.0.0'
depends 'mariadb', '~> 1.5'
depends 'mysql', '~> 8.2'

View File

@ -10,7 +10,7 @@ describe 'openstack-ops-database::client' do
let(:chef_run) { runner.converge(described_recipe) }
it 'uses mariadb client recipe by default' do
node.set['openstack']['db']['service_type'] = 'mariadb'
node.override['openstack']['db']['service_type'] = 'mariadb'
expect(chef_run).to include_recipe 'openstack-ops-database::mariadb-client'
end
end

View File

@ -26,8 +26,8 @@ describe 'openstack-ops-database::mysql-server' do
describe 'creates mysql service with different values' do
before do
node.set['openstack']['mysql']['data_dir'] = '/other-dir'
node.set['openstack']['mysql']['version'] = '5.7'
node.override['openstack']['mysql']['data_dir'] = '/other-dir'
node.override['openstack']['mysql']['version'] = '5.7'
end
it do
expect(chef_run).to create_mysql_service('default').with(

View File

@ -10,7 +10,7 @@ describe 'openstack-ops-database::server' do
let(:chef_run) { runner.converge(described_recipe) }
it 'uses mariadb server recipe by default' do
node.set['openstack']['db']['service_type'] = 'mariadb'
node.override['openstack']['db']['service_type'] = 'mariadb'
expect(chef_run).to include_recipe('openstack-ops-database::mariadb-server')
end
end