openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove logic for CentOS < 9"

Browse Source
This commit is contained in:
Zuul 2022-11-25 16:21:23 +00:00 committed by Gerrit Code Review
commit 8c2e41847e
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/neutron.pp
View File

@ -41,7 +41,7 @@ class openstack_integration::neutron (
Exec['update-ca-certificates'] ~> Service<| tag == 'neutron-service' |> Exec['update-ca-certificates'] ~> Service<| tag == 'neutron-service' |>
} }
if ($::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '8') >= 0) { if $::operatingsystem == 'CentOS' {
# os_neutron_dac_override should be on to start privsep-helper # os_neutron_dac_override should be on to start privsep-helper
# See https://bugzilla.redhat.com/show_bug.cgi?id=1850973 # See https://bugzilla.redhat.com/show_bug.cgi?id=1850973
selboolean { 'os_neutron_dac_override': selboolean { 'os_neutron_dac_override':
@ -58,12 +58,6 @@ class openstack_integration::neutron (
case $driver { case $driver {
'openvswitch', 'ovn': { 'openvswitch', 'ovn': {
include vswitch::ovs include vswitch::ovs
# In CentOS8 puppet-vswitch requires network-scripts package until it's ported to NM.
if ($::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '8') == 0) {
package { 'network-scripts-openvswitch':
ensure => 'latest'
}
}
# Functional test for Open-vSwitch: # Functional test for Open-vSwitch:
# create dummy loopback interface to exercise adding a port to a bridge # create dummy loopback interface to exercise adding a port to a bridge
vs_bridge { 'br-ex': vs_bridge { 'br-ex':

24
manifests/repos.pp
View File

@ -59,20 +59,12 @@ class openstack_integration::repos {
$ceph_mirror = $ceph_mirror_fallback $ceph_mirror = $ceph_mirror_fallback
} }
'RedHat': { 'RedHat': {
# Set specific variables for CentOS Stream 9
if versioncmp($::os['release']['major'], '9') >= 0 {
$powertools_repo = 'crb' $powertools_repo = 'crb'
} else {
$powertools_repo = 'powertools'
}
if defined('$::centos_mirror_host') and $::centos_mirror_host != '' { if defined('$::centos_mirror_host') and $::centos_mirror_host != '' {
$centos_mirror = $::centos_mirror_host $centos_mirror = $::centos_mirror_host
} else { } else {
$centos_mirror = $::os['release']['major'] ? { $centos_mirror = 'http://mirror.stream.centos.org'
'9' => 'http://mirror.stream.centos.org',
default => 'http://mirror.centos.org',
}
} }
if defined('$::delorean_repo_path') and $::delorean_repo_path != '' { if defined('$::delorean_repo_path') and $::delorean_repo_path != '' {
@ -99,16 +91,14 @@ class openstack_integration::repos {
update_packages => true, update_packages => true,
} }
$ceph_mirror_fallback = $::os['release']['major'] ? { $ceph_mirror_fallback = "${centos_mirror}/SIGs/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/"
'9' => "${centos_mirror}/SIGs/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/",
default => "${centos_mirror}/centos/${::os['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/",
}
if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' { if defined('$::ceph_mirror_host') and $::ceph_mirror_host != '' {
$ceph_mirror = pick($::ceph_mirror_host, $ceph_mirror_fallback) $ceph_mirror = $::ceph_mirror_host
} else { } else {
$ceph_mirror = $ceph_mirror_fallback $ceph_mirror = $ceph_mirror_fallback
} }
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL. # On CentOS, deploy Ceph using SIG repository and get rid of EPEL.
# https://wiki.centos.org/SpecialInterestGroup/Storage/ # https://wiki.centos.org/SpecialInterestGroup/Storage/
if $::operatingsystem == 'CentOS' { if $::operatingsystem == 'CentOS' {
@ -120,10 +110,10 @@ class openstack_integration::repos {
} }
# PowerTools is required on CentOS8 since Ussuri. # PowerTools is required on CentOS8 since Ussuri.
exec { 'enable-powertools': exec { 'enable-crb':
command => "dnf config-manager --enable ${powertools_repo}", command => 'dnf config-manager --enable crb',
path => '/usr/bin/', path => '/usr/bin/',
unless => "test 0 -ne $(dnf repolist --enabled ${powertools_repo} | wc -l)" unless => 'test 0 -ne $(dnf repolist --enabled crb | wc -l)'
} }
} }
default: { default: {