Remove logic for Fedora and old CentOS

This change removes logic for Fedora and old CentOS(CentOS 7) because
these are no longer supported. Also, ssl is re-enabled in scenario 002
job in CentOS.

Change-Id: Ibf5da4a538cdd52604d3c5daaf42bf8ae4f4fb9b
This commit is contained in:
Takashi Kajinami 2022-03-22 00:01:06 +09:00
parent d58599e686
commit b9428f03de
6 changed files with 13 additions and 29 deletions

View File

@ -16,7 +16,7 @@
# Keystone only puppet deployment
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
if $::os['name'] == 'Ubuntu' {
$ssl = false
} else {
$ssl = true

View File

@ -14,7 +14,7 @@
# limitations under the License.
#
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
if $::os['name'] == 'Ubuntu' {
$ssl = false
} else {
$ssl = true

View File

@ -14,9 +14,7 @@
# limitations under the License.
#
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
# FIXME(ykarel) Disable SSL until services are ready to work with SSL + Python3
if $::os['name'] == 'Ubuntu' {
$ssl = false
} else {
$ssl = true
@ -24,13 +22,13 @@ if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') or
case $::osfamily {
'Debian': {
$ipv6 = false
$ipv6 = false
# ec2api is not packaged on UCA
$ec2api_enabled = false
$ec2api_enabled = false
}
'RedHat': {
$ipv6 = true
$ec2api_enabled = true
$ipv6 = true
$ec2api_enabled = true
}
default: {
fail("Unsupported osfamily (${::osfamily})")

View File

@ -14,7 +14,7 @@
# limitations under the License.
#
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
if $::os['name'] == 'Ubuntu' {
$ssl = false
} else {
$ssl = true

View File

@ -14,7 +14,7 @@
# limitations under the License.
#
if ($::os['name'] == 'Ubuntu') or ($::os['name'] == 'Fedora') {
if $::os['name'] == 'Ubuntu' {
$ssl = false
} else {
$ssl = true

View File

@ -102,24 +102,10 @@ class openstack_integration::repos {
}
# PowerTools is required on CentOS8 since Ussuri.
if $::operatingsystem == 'CentOS' {
exec { 'enable-powertools':
command => "dnf config-manager --enable ${powertools_repo}",
path => '/usr/bin/',
unless => "test 0 -ne $(dnf repolist --enabled ${powertools_repo} | wc -l)"
}
}
# Remove Fedora Base repos as stable-base repo is configured which includes
# all required packages
if $::operatingsystem == 'Fedora' {
tidy { 'delete-fedora-base-repos':
path => '/etc/yum.repos.d',
recurse => true,
matches => [ 'fedora*.repo' ],
rmdirs => false,
require => Class['openstack_extras::repo::redhat::redhat'],
}
exec { 'enable-powertools':
command => "dnf config-manager --enable ${powertools_repo}",
path => '/usr/bin/',
unless => "test 0 -ne $(dnf repolist --enabled ${powertools_repo} | wc -l)"
}
}
default: {