Loosen version pin to bind cookbook
They still haven't released the cookbook however they've updated the release to 3.1.0 which is breaking tests globally. This should resolve the issue. Also apply fixes for using the resolver 3.x cookbook. Change-Id: I5b0a6783f0602983baeaf8b0e9bb90f150212644 Depends-On: https://review.opendev.org/c/openstack/openstack-chef/+/800841 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
786d6a3896
commit
6214f4a2d1
@ -3,18 +3,18 @@ maintainer 'openstack-chef'
|
||||
maintainer_email 'openstack-discuss@lists.openstack.org'
|
||||
license 'Apache-2.0'
|
||||
description 'Installs and configures the Tempest Integration Test Suite'
|
||||
version '19.0.0'
|
||||
version '19.1.0'
|
||||
|
||||
%w(ubuntu redhat centos).each do |os|
|
||||
supports os
|
||||
end
|
||||
|
||||
depends 'bind', '~> 2.3.1'
|
||||
depends 'bind', '~> 3.1.0'
|
||||
depends 'openstackclient'
|
||||
depends 'openstack-common', '>= 19.0.0'
|
||||
depends 'openstack-dns', '>= 19.0.0'
|
||||
depends 'openstack-image', '>= 19.0.0'
|
||||
depends 'resolver'
|
||||
depends 'resolver', '>= 3.0.0'
|
||||
|
||||
issues_url 'https://launchpad.net/openstack-chef'
|
||||
source_url 'https://opendev.org/openstack/cookbook-openstack-integration-test'
|
||||
|
@ -33,10 +33,10 @@ end
|
||||
|
||||
# Match what opendev/base-jobs uses for unbound:
|
||||
# https://opendev.org/opendev/base-jobs/src/branch/master/roles/configure-unbound/defaults/main.yaml#L1-L7
|
||||
node.default['resolver']['search'] = []
|
||||
node.default['resolver']['nameservers'] = %w(1.0.0.1 8.8.8.8)
|
||||
|
||||
include_recipe 'resolver'
|
||||
resolver_config '/etc/resolv.conf' do
|
||||
nameservers %w(1.0.0.1 8.8.8.8)
|
||||
end
|
||||
|
||||
# Disable and stop unbound so we can properly test Designate
|
||||
service 'unbound' do
|
||||
|
@ -11,13 +11,10 @@ describe 'openstack-integration-test::dns' do
|
||||
|
||||
include_context 'tempest-stubs'
|
||||
|
||||
[
|
||||
/^nameserver 1.0.0.1$/,
|
||||
/^nameserver 8.8.8.8$/,
|
||||
].each do |line|
|
||||
it do
|
||||
expect(chef_run).to render_file('/etc/resolv.conf').with_content(line)
|
||||
end
|
||||
it do
|
||||
expect(chef_run).to set_resolver_config('/etc/resolv.conf').with(
|
||||
nameservers: %w(1.0.0.1 8.8.8.8)
|
||||
)
|
||||
end
|
||||
|
||||
it do
|
||||
|
@ -16,13 +16,10 @@ describe 'openstack-integration-test::dns' do
|
||||
expect(chef_run).to disable_service('systemd-resolved')
|
||||
end
|
||||
|
||||
[
|
||||
/^nameserver 1.0.0.1$/,
|
||||
/^nameserver 8.8.8.8$/,
|
||||
].each do |line|
|
||||
it do
|
||||
expect(chef_run).to render_file('/etc/resolv.conf').with_content(line)
|
||||
end
|
||||
it do
|
||||
expect(chef_run).to set_resolver_config('/etc/resolv.conf').with(
|
||||
nameservers: %w(1.0.0.1 8.8.8.8)
|
||||
)
|
||||
end
|
||||
|
||||
it do
|
||||
|
Loading…
Reference in New Issue
Block a user