openstack
/
puppet-openstack_extras
Code Issues Proposed changes

Merge "Use 'dnf' when configuring repo in Fedora"

This commit is contained in:
Zuul 2018-07-03 19:48:15 +00:00 committed by Gerrit Code Review
parent 6d2a8b95f2 7c4183e336
commit c5f5deeba8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/repo/redhat/redhat.pp
View File

@ -115,7 +115,7 @@ class openstack_extras::repo::redhat::redhat(
create_resources('yumrepo', $rdo_hash, $_repo_defaults) create_resources('yumrepo', $rdo_hash, $_repo_defaults)
} }
if $manage_virt { if $manage_virt and ($::operatingsystem != 'Fedora') {
$virt_hash = { $virt_hash = {
'rdo-qemu-ev' => { 'rdo-qemu-ev' => {
'baseurl' => "${centos_mirror_url}/centos/7/virt/\$basearch/kvm-common/", 'baseurl' => "${centos_mirror_url}/centos/7/virt/\$basearch/kvm-common/",
@ -174,7 +174,7 @@ class openstack_extras::repo::redhat::redhat(
resources { 'yumrepo': purge => true } resources { 'yumrepo': purge => true }
} }
if $manage_priorities { if $manage_priorities and ($::operatingsystem != 'Fedora') {
exec { 'installing_yum-plugin-priorities': exec { 'installing_yum-plugin-priorities':
command => '/usr/bin/yum install -y yum-plugin-priorities', command => '/usr/bin/yum install -y yum-plugin-priorities',
logoutput => 'on_failure', logoutput => 'on_failure',
@ -189,9 +189,16 @@ class openstack_extras::repo::redhat::redhat(
Yumrepo<||> -> Package<||> Yumrepo<||> -> Package<||>
} }
exec { 'yum_refresh': if ($::operatingsystem == 'Fedora') {
command => '/usr/bin/yum clean all', exec { 'yum_refresh':
refreshonly => true, command => '/usr/bin/dnf clean all',
} -> Package <||> refreshonly => true,
} -> Package <||>
} else {
exec { 'yum_refresh':
command => '/usr/bin/yum clean all',
refreshonly => true,
} -> Package <||>
}
} }