diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp index ca5dc90e6..7ed957698 100644 --- a/manifests/compute/libvirt/services.pp +++ b/manifests/compute/libvirt/services.pp @@ -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, diff --git a/manifests/compute/libvirt/version.pp b/manifests/compute/libvirt/version.pp index e23b47bfd..09b29ea1b 100644 --- a/manifests/compute/libvirt/version.pp +++ b/manifests/compute/libvirt/version.pp @@ -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': { diff --git a/manifests/params.pp b/manifests/params.pp index 4d85b1fcf..8b85b9ff8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 diff --git a/metadata.json b/metadata.json index ede9d5d1c..1884603c8 100644 --- a/metadata.json +++ b/metadata.json @@ -45,12 +45,6 @@ "11" ] }, - { - "operatingsystem": "Fedora", - "operatingsystemrelease": [ - "24" - ] - }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ diff --git a/releasenotes/notes/drop-fedora-6722ae14b04142a4.yaml b/releasenotes/notes/drop-fedora-6722ae14b04142a4.yaml new file mode 100644 index 000000000..71818df43 --- /dev/null +++ b/releasenotes/notes/drop-fedora-6722ae14b04142a4.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Fedora is no longer supported. diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index 729848d93..50e5a96f6 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -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({