Merge "Loosen version pin to bind cookbook" into stable/stein

metadata.rb

@@ -9,12 +9,12 @@ version          '19.1.0'
   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'

recipes/dns.rb

@@ -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

spec/dns-rhel_spec.rb

@@ -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

spec/dns_spec.rb

@@ -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