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

6
spec/api-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::api' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::api' do
end
end
end
end

6
spec/central-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::central' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::central' do
end
end
end
end

14
spec/common-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::common' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -19,9 +20,17 @@ describe 'openstack-dns::common' 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)
end
case p
when REDHAT_7
it do
expect(chef_run).to upgrade_package('MySQL-python')
end
when REDHAT_8
it do
expect(chef_run).to upgrade_package('python3-PyMySQL')
end
end
it do
expect(chef_run).to create_template('/etc/designate/pools.yaml').with(
source: 'pools.yaml.erb',
@@ -40,3 +49,4 @@ describe 'openstack-dns::common' do
end
end
end
end

6
spec/mdns-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::mdns' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::mdns' do
end
end
end
end

6
spec/producer-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::producer' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::producer' do
end
end
end
end

6
spec/sink-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::sink' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::sink' do
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'
end
REDHAT_OPTS = {
REDHAT_7 = {
platform: 'redhat',
version: '7',
}.freeze
REDHAT_8 = {
platform: 'redhat',
version: '8',
}.freeze
ALL_RHEL = [
REDHAT_7,
REDHAT_8,
].freeze
UBUNTU_OPTS = {
platform: 'ubuntu',
version: '18.04',

6
spec/worker-rhel_spec.rb
View File

@@ -1,8 +1,9 @@
require_relative 'spec_helper'
describe 'openstack-dns::worker' do
describe 'redhat' do
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
ALL_RHEL.each do |p|
context "redhat #{p[:version]}" do
let(:runner) { ChefSpec::SoloRunner.new(p) }
let(:node) { runner.node }
cached(:chef_run) do
runner.converge(described_recipe)
@@ -26,3 +27,4 @@ describe 'openstack-dns::worker' do
end
end
end
end