openstack/cookbook-openstack-dns
Code Issues Proposed changes

CentOS 8 support

Browse Source 
- Update ChefSpec

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-network/+/815172
Change-Id: I617cdb3879dbb1827dff542888808f96dd988c1e
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Lance Albertson
2021-10-22 16:05:34 -07:00
parent 0731b49f19
commit c6042984e7
8 changed files with 188 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spec/api-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::api' do describe 'openstack-dns::api' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate-api').with( expect(chef_run).to enable_service('designate-api').with(
service_name: 'designate-api', service_name: 'designate-api',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate-api') expect(chef_run).to start_service('designate-api')
end end
it do it do
expect(chef_run.service('designate-api')).to \ expect(chef_run.service('designate-api')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end

42
spec/central-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::central' do describe 'openstack-dns::central' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate_central').with( expect(chef_run).to enable_service('designate_central').with(
service_name: 'designate-central', service_name: 'designate-central',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate_central') expect(chef_run).to start_service('designate_central')
end end
it do it do
expect(chef_run.service('designate_central')).to \ expect(chef_run.service('designate_central')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end

78
spec/common-rhel_spec.rb
View File

@@ -1,42 +1,52 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::common' do describe 'openstack-dns::common' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to_not include_recipe('openstack-common::logging') expect(chef_run).to_not include_recipe('openstack-common::logging')
end end
it 'install designate packages' do it 'install designate packages' do
expect(chef_run).to upgrade_package %w(openstack-designate-api openstack-designate-central openstack-designate-mdns openstack-designate-producer openstack-designate-worker openstack-designate-sink) expect(chef_run).to upgrade_package %w(openstack-designate-api openstack-designate-central openstack-designate-mdns openstack-designate-producer openstack-designate-worker openstack-designate-sink)
end end
it do
expect(chef_run).to upgrade_package('MySQL-python') case p
end when REDHAT_7
it do it do
expect(chef_run).to create_template('/etc/designate/pools.yaml').with( expect(chef_run).to upgrade_package('MySQL-python')
source: 'pools.yaml.erb', end
owner: 'designate', when REDHAT_8
group: 'designate', it do
mode: '644', expect(chef_run).to upgrade_package('python3-PyMySQL')
variables: { end
banner: "\n# This file was autogenerated by Chef\n# Do not edit, changes will be overwritten\n", end
bind_hosts: %w(127.0.0.1), it do
masters: %w(127.0.0.1), expect(chef_run).to create_template('/etc/designate/pools.yaml').with(
ns_addresses: %w(127.0.0.1), source: 'pools.yaml.erb',
ns_hostnames: %w(ns1.example.org.), owner: 'designate',
rndc_key: '/etc/designate/rndc.key', group: 'designate',
} mode: '644',
) variables: {
banner: "\n# This file was autogenerated by Chef\n# Do not edit, changes will be overwritten\n",
bind_hosts: %w(127.0.0.1),
masters: %w(127.0.0.1),
ns_addresses: %w(127.0.0.1),
ns_hostnames: %w(ns1.example.org.),
rndc_key: '/etc/designate/rndc.key',
}
)
end
end end
end end
end end

42
spec/mdns-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::mdns' do describe 'openstack-dns::mdns' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate_mdns').with( expect(chef_run).to enable_service('designate_mdns').with(
service_name: 'designate-mdns', service_name: 'designate-mdns',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate_mdns') expect(chef_run).to start_service('designate_mdns')
end end
it do it do
expect(chef_run.service('designate_mdns')).to \ expect(chef_run.service('designate_mdns')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end

42
spec/producer-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::producer' do describe 'openstack-dns::producer' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate_producer').with( expect(chef_run).to enable_service('designate_producer').with(
service_name: 'designate-producer', service_name: 'designate-producer',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate_producer') expect(chef_run).to start_service('designate_producer')
end end
it do it do
expect(chef_run.service('designate_producer')).to \ expect(chef_run.service('designate_producer')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end

42
spec/sink-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::sink' do describe 'openstack-dns::sink' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate_sink').with( expect(chef_run).to enable_service('designate_sink').with(
service_name: 'designate-sink', service_name: 'designate-sink',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate_sink') expect(chef_run).to start_service('designate_sink')
end end
it do it do
expect(chef_run.service('designate_sink')).to \ expect(chef_run.service('designate_sink')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end

13
spec/spec_helper.rb
View File

@@ -10,10 +10,21 @@ RSpec.configure do |config|
config.file_cache_path = '/var/chef/cache' config.file_cache_path = '/var/chef/cache'
end end
REDHAT_OPTS = { REDHAT_7 = {
platform: 'redhat', platform: 'redhat',
version: '7', version: '7',
}.freeze }.freeze
REDHAT_8 = {
platform: 'redhat',
version: '8',
}.freeze
ALL_RHEL = [
REDHAT_7,
REDHAT_8,
].freeze
UBUNTU_OPTS = { UBUNTU_OPTS = {
platform: 'ubuntu', platform: 'ubuntu',
version: '18.04', version: '18.04',

42
spec/worker-rhel_spec.rb
View File

@@ -1,28 +1,30 @@
require_relative 'spec_helper' require_relative 'spec_helper'
describe 'openstack-dns::worker' do describe 'openstack-dns::worker' do
describe 'redhat' do ALL_RHEL.each do |p|
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) } context "redhat #{p[:version]}" do
let(:node) { runner.node } let(:runner) { ChefSpec::SoloRunner.new(p) }
cached(:chef_run) do let(:node) { runner.node }
runner.converge(described_recipe) cached(:chef_run) do
end runner.converge(described_recipe)
end
include_context 'dns-stubs' include_context 'dns-stubs'
it 'converges successfully' do it 'converges successfully' do
expect { :chef_run }.to_not raise_error expect { :chef_run }.to_not raise_error
end end
it do it do
expect(chef_run).to enable_service('designate_worker').with( expect(chef_run).to enable_service('designate_worker').with(
service_name: 'designate-worker', service_name: 'designate-worker',
supports: { restart: true, status: true } supports: { restart: true, status: true }
) )
expect(chef_run).to start_service('designate_worker') expect(chef_run).to start_service('designate_worker')
end end
it do it do
expect(chef_run.service('designate_worker')).to \ expect(chef_run.service('designate_worker')).to \
subscribe_to('template[/etc/designate/designate.conf]').on(:restart) subscribe_to('template[/etc/designate/designate.conf]').on(:restart)
end
end end
end end
end end