Remove bind cookbook from Berksfile and fix version pin
The bind cookbook has been migrated to the Sous Chefs and a new release has finally been done which removes the need to have this in the pointer (which is now broken). In addition, update cacert which is shipped in the python requests package on RHEL to work around expired LetsEncrypt root certificate. Depends-On: https://review.opendev.org/813719 Change-Id: Id537867e47ed54c7028abf7037b251077e57de64 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
bd5d493b45
commit
f811d825fb
@ -20,8 +20,4 @@ solver :ruby, :required
|
||||
end
|
||||
end
|
||||
|
||||
# TODO(ramereth): Remove after this PR is released
|
||||
# https://github.com/joyofhex/cookbook-bind/pull/60
|
||||
cookbook 'bind', github: 'joyofhex/cookbook-bind'
|
||||
|
||||
metadata
|
||||
|
3154
files/default/cacert.pem
Normal file
3154
files/default/cacert.pem
Normal file
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@ version '20.0.0'
|
||||
supports os
|
||||
end
|
||||
|
||||
depends 'bind', '~> 3.1.0'
|
||||
depends 'bind', '~> 3.0.0'
|
||||
depends 'openstackclient'
|
||||
depends 'openstack-common', '>= 20.0.0'
|
||||
depends 'openstack-dns', '>= 20.0.0'
|
||||
|
@ -96,6 +96,9 @@ execute 'create virtualenv for tempest' do
|
||||
creates venv_path
|
||||
end
|
||||
|
||||
# TODO(ramereth): RDO Train ships a cacert.pem which contains the expired LetsEncrypt root cert
|
||||
cookbook_file "#{venv_path}/lib/python2.7/site-packages/pip/_vendor/requests/cacert.pem" if platform_family?('redhat')
|
||||
|
||||
# Note(jh): Make sure to keep the constraint definition in sync with
|
||||
# the tempest version
|
||||
tempest_ver = '22.1.0'
|
||||
|
Loading…
Reference in New Issue
Block a user