openstack
/
puppet-nova
Code Issues Proposed changes

Drop Fedora support 

Fedora support is never tested, and has been unmaintained for a while.
Because we don't expect any actual user using OpenStack on Fedora, this
change drops support for Fedora directly.

Change-Id: I4d96eaf73bdfbed5aab9c6f5c60da3d6005d8cf9
This commit is contained in:
Takashi Kajinami 2021-08-05 23:28:15 +09:00
parent 516d9c1d93
commit 38cf3a57ad
6 changed files with 14 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute/libvirt/services.pp
View File

@ -68,7 +68,7 @@ class nova::compute::libvirt::services (
}
# messagebus
if($::osfamily == 'RedHat' and $::operatingsystem != 'Fedora') {
if($::osfamily == 'RedHat') {
service { 'messagebus':
ensure => running,
enable => true,

27
manifests/compute/libvirt/version.pp
View File

@ -6,29 +6,14 @@
# or higher.
#
class nova::compute::libvirt::version {
# This will be 7.5 or 7.6 on RedHat, 9 on Debian, 18.10 or cosmic on Ubuntu, etc.
case $facts['os']['family'] {
'RedHat': {
case $facts['os']['name'] {
'RedHat', 'CentOS': {
if versioncmp($facts['os']['release']['full'], '8') >= 0 {
$default = '5.6'
} elsif versioncmp($facts['os']['release']['full'], '7.6') >= 0 {
$default = '4.5'
} else {
$default = '3.9'
}
}
'Fedora': {
if versioncmp($facts['os']['release']['full'], '29') >= 0 {
$default = '4.5'
} else {
$default = '3.9'
}
}
default: {
$default = '3.9'
}
if versioncmp($facts['os']['release']['full'], '8') >= 0 {
$default = '5.6'
} elsif versioncmp($facts['os']['release']['full'], '7.6') >= 0 {
$default = '4.5'
} else {
$default = '3.9'
}
}
'Debian': {

13
manifests/params.pp
View File

@ -51,16 +51,9 @@ class nova::params {
$nova_wsgi_script_path = '/var/www/cgi-bin/nova'
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi'
case $::operatingsystem {
'Fedora': {
$messagebus_service_name = undef
}
default: {
$messagebus_service_name = 'dbus'
}
}
$nova_user = 'nova'
$nova_group = 'nova'
$messagebus_service_name = 'dbus'
$nova_user = 'nova'
$nova_group = 'nova'
}
'Debian': {
# package names

6
metadata.json
View File

@ -45,12 +45,6 @@
"11"
]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"24"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [

4
releasenotes/notes/drop-fedora-6722ae14b04142a4.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Fedora is no longer supported.

30
spec/classes/nova_compute_libvirt_spec.rb
View File

@ -350,36 +350,6 @@ describe 'nova::compute::libvirt' do
end
end
describe 'with default parameters on Fedora' do
before do
facts.merge!({ :operatingsystem => 'Fedora', :osfamily => 'RedHat' })
end
it { is_expected.to contain_class('nova::params')}
it { is_expected.to contain_package('libvirt').with(
:name => 'libvirt-daemon-kvm',
:ensure => 'present'
) }
it { is_expected.to contain_package('libvirt-nwfilter').with(
:name => 'libvirt-daemon-config-nwfilter',
:ensure => 'present',
:before => ['Service[libvirt]', 'Anchor[nova::install::end]'],
) }
it { is_expected.to contain_service('libvirt').with(
:name => 'libvirtd',
:enable => true,
:ensure => 'running',
:before => ['Service[nova-compute]']
)}
it { is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('libvirt.LibvirtDriver')}
it { is_expected.to contain_nova_config('libvirt/virt_type').with_value('kvm')}
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('127.0.0.1')}
end
end
on_supported_os({