Browse Source

Updates for Train

Changed:
- Update release to train
- Update to mariadb ~> 4.0

Fixed:
- Migrate to using Chef::Log.warn instead of the log resource to fix
  idempotency issues.
- Cookstyle

Removed:
- Unused .rubocop.yml

Depends-On: https://review.opendev.org/731851
Change-Id: Ia705cf4fb00098ba5d34f22268c0e409b82580a0
changes/55/731855/3
Lance Albertson 1 year ago
parent
commit
38d0a27c66
5 changed files with 15 additions and 29 deletions
  1. +0
    -14
      .rubocop.yml
  2. +3
    -3
      README.rst
  3. +8
    -8
      Rakefile
  4. +3
    -3
      metadata.rb
  5. +1
    -1
      recipes/openstack-db.rb

+ 0
- 14
.rubocop.yml View File

@ -1,14 +0,0 @@
AllCops:
Include:
- metadata.rb
- Gemfile
- attributes/**
- libraries/**
- providers/**
- recipes/**
- resources/**
- spec/**
Exclude:
- .cookbooks/**/*
- berks-cookbooks/**/*
- .bundle/**/*

+ 3
- 3
README.rst View File

@ -15,7 +15,7 @@ Requirements
============
- Chef 15 or higher
- Chef Workstation 0.15.18 for testing (also includes Berkshelf for cookbook
- Chef Workstation 0.18.3 for testing (also includes Berkshelf for cookbook
dependency resolution)
Platforms
@ -30,8 +30,8 @@ Cookbooks
The following cookbooks are dependencies:
- 'mariadb', '~> 3.1'
- 'openstack-common', '~> 19.0.0'
- 'mariadb', '~> 4.0'
- 'openstack-common', '~> 20.0.0'
Usage
=====


+ 8
- 8
Rakefile View File

@ -1,28 +1,28 @@
task default: ["test"]
task default: ['test']
task test: [:syntax, :lint, :unit]
desc "Vendor the cookbooks in the Berksfile"
desc 'Vendor the cookbooks in the Berksfile'
task :berks_prep do
sh %(chef exec berks vendor)
end
desc "Run FoodCritic (syntax) tests"
desc 'Run FoodCritic (syntax) tests'
task :syntax do
sh %(chef exec foodcritic --exclude spec -f any .)
end
desc "Run RuboCop (lint) tests"
desc 'Run RuboCop (lint) tests'
task :lint do
sh %(chef exec cookstyle)
end
desc "Run RSpec (unit) tests"
desc 'Run RSpec (unit) tests'
task unit: :berks_prep do
sh %(chef exec rspec --format documentation)
end
desc "Remove the berks-cookbooks directory and the Berksfile.lock"
desc 'Remove the berks-cookbooks directory and the Berksfile.lock'
task :clean do
rm_rf [
'berks-cookbooks',
@ -30,10 +30,10 @@ task :clean do
]
end
desc "All-in-One Neutron build Infra using Common task"
desc 'All-in-One Neutron build Infra using Common task'
task :integration do
# Use the common integration task
sh %(wget -nv -t 3 -O Rakefile-Common https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
load './Rakefile-Common'
Rake::Task["common_integration"].invoke
Rake::Task['common_integration'].invoke
end

+ 3
- 3
metadata.rb View File

@ -3,15 +3,15 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0'
description 'Provides the shared database configuration for OpenStack'
version '19.0.0'
version '20.0.0'
%w(ubuntu redhat centos).each do |os|
supports os
end
depends 'openstack-common', '>= 19.0.0'
depends 'openstack-common', '>= 20.0.0'
depends 'mariadb', '~> 3.1'
depends 'mariadb', '~> 4.0'
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-ops-database'


+ 1
- 1
recipes/openstack-db.rb View File

@ -34,6 +34,6 @@ node['openstack']['common']['services'].each do |service, project|
pass password
end
rescue Net::HTTPServerException, ChefVault::Exceptions::KeysNotFound
log "No databag item containing the database password for #{project} was found, so no database was created"
Chef::Log.warn("No databag item containing the database password for #{project} was found, so no database was created")
end
end

Loading…
Cancel
Save