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. Depends-On: https://review.opendev.org/731851 Change-Id: Ia705cf4fb00098ba5d34f22268c0e409b82580a0
This commit is contained in:
parent
601c814995
commit
34868fd8e8
|
@ -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
|
||||
=====
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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…
Reference in New Issue