CentOS 8 support

- ChefSpec updates

Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/815147
Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-compute/+/815173
Change-Id: I17fc8fafd977c8412f8e9519642ccbcd427c2949
Signed-off-by: Lance Albertson <lance@osuosl.org>

spec/api-cfn-redhat_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::api-cfn' 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) { runner.converge(described_recipe) }
 
@@ -21,4 +22,5 @@ describe 'openstack-orchestration::api-cfn' do
         expect(chef_run).to start_service('openstack-heat-api-cfn')
       end
     end
+  end
 end

spec/api-redhat_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::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) { runner.converge(described_recipe) }
 
@@ -21,4 +22,5 @@ describe 'openstack-orchestration::api' do
         expect(chef_run).to start_service('openstack-heat-api')
       end
     end
+  end
 end

spec/common-redhat_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::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) { runner.converge(described_recipe) }
 
@@ -17,8 +18,17 @@ describe 'openstack-orchestration::common' do
       it do
         expect(chef_run).to upgrade_package 'openstack-heat-common'
       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
+    end
   end
 end

spec/dashboard-redhat_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::dashboard' 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) { runner.converge(described_recipe) }
 
@@ -11,4 +12,5 @@ describe 'openstack-orchestration::dashboard' do
         expect(chef_run).to upgrade_package 'openstack-heat-ui'
       end
     end
+  end
 end

spec/engine-redhat_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::engine' 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) { runner.converge(described_recipe) }
 
@@ -21,4 +22,5 @@ describe 'openstack-orchestration::engine' do
         expect(chef_run).to start_service('openstack-heat-engine')
       end
     end
+  end
 end

spec/identity_registration_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
 describe 'openstack-orchestration::identity_registration' 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) { runner.converge(described_recipe) }
 
@@ -144,4 +145,5 @@ describe 'openstack-orchestration::identity_registration' do
         end
       end
     end
+  end
 end

spec/spec_helper.rb

@@ -8,10 +8,21 @@ RSpec.configure do |config|
   config.log_level = :warn
 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',
@@ -75,9 +86,16 @@ shared_examples 'expect installs common heat package' do
 end
 
 shared_examples 'expect installs mysql package' do
+  case p
+  when REDHAT_7
     it 'installs mysql python packages by default' do
       expect(chef_run).to upgrade_package 'MySQL-python'
     end
+  when REDHAT_8
+    it 'installs mysql python packages by default' do
+      expect(chef_run).to upgrade_package 'python3-PyMySQL'
+    end
+  end
 end
 
 shared_examples 'expect runs db migrations' do