From 0b08fc614292f04317e82c652cdddf364ab934b8 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 22 Aug 2020 21:07:14 -0700 Subject: [PATCH] Chef 16 updates Depends-On: https://review.opendev.org/740342 Change-Id: Ic6385a7cb14d1f036b0cf1a6d92ecf5930f271fb Signed-off-by: Lance Albertson --- README.rst | 2 +- recipes/openstack-db.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index af58164..c8ea358 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ Requirements ============ - Chef 15 or higher -- Chef Workstation 0.18.3 for testing (also includes Berkshelf for cookbook +- Chef Workstation 20.8.111 for testing (also includes Berkshelf for cookbook dependency resolution) Platforms diff --git a/recipes/openstack-db.rb b/recipes/openstack-db.rb index 2a68e9e..de8aac8 100644 --- a/recipes/openstack-db.rb +++ b/recipes/openstack-db.rb @@ -33,7 +33,7 @@ node['openstack']['common']['services'].each do |service, project| user username pass password end - rescue Net::HTTPServerException, ChefVault::Exceptions::KeysNotFound + rescue Net::HTTPClientException, ChefVault::Exceptions::KeysNotFound Chef::Log.warn("No databag item containing the database password for #{project} was found, so no database was created") end end