Do not enable Ceph el7 repos for Fedora
Fedora Base repo includes ceph packages, so no extra repo required as the packages in Fedora repo conflicts with el7 repo. The ceph packages are also being added to fedora stable-base([1]) consumed in Fedora Testing. [1] https://review.rdoproject.org/r/#/c/17650/ Change-Id: I1f1e8461cf49c680de2630396cdec5ff5774f0ec
This commit is contained in:
parent
b817404aed
commit
698def7bfd
|
@ -170,44 +170,46 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
|
|||
}
|
||||
|
||||
|
||||
yumrepo { 'ext-ceph':
|
||||
# puppet versions prior to 3.5 do not support ensure, use enabled instead
|
||||
enabled => $enabled,
|
||||
descr => "External Ceph ${release}",
|
||||
name => "ext-ceph-${release}",
|
||||
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/\$basearch",
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'https://download.ceph.com/keys/release.asc',
|
||||
mirrorlist => absent,
|
||||
priority => '10', # prefer ceph repos over EPEL
|
||||
tag => 'ceph',
|
||||
}
|
||||
|
||||
yumrepo { 'ext-ceph-noarch':
|
||||
# puppet versions prior to 3.5 do not support ensure, use enabled instead
|
||||
enabled => $enabled,
|
||||
descr => 'External Ceph noarch',
|
||||
name => "ext-ceph-${release}-noarch",
|
||||
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/noarch",
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'https://download.ceph.com/keys/release.asc',
|
||||
mirrorlist => absent,
|
||||
priority => '10', # prefer ceph repos over EPEL
|
||||
tag => 'ceph',
|
||||
}
|
||||
|
||||
if $fastcgi {
|
||||
yumrepo { 'ext-ceph-fastcgi':
|
||||
if ($::operatingsystem != 'Fedora') {
|
||||
yumrepo { 'ext-ceph':
|
||||
# puppet versions prior to 3.5 do not support ensure, use enabled instead
|
||||
enabled => $enabled,
|
||||
descr => 'FastCGI basearch packages for Ceph',
|
||||
name => 'ext-ceph-fastcgi',
|
||||
baseurl => "http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel${el}-x86_64-basic/ref/master",
|
||||
descr => "External Ceph ${release}",
|
||||
name => "ext-ceph-${release}",
|
||||
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/\$basearch",
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
|
||||
gpgkey => 'https://download.ceph.com/keys/release.asc',
|
||||
mirrorlist => absent,
|
||||
priority => '20', # prefer ceph repos over EPEL
|
||||
priority => '10', # prefer ceph repos over EPEL
|
||||
tag => 'ceph',
|
||||
}
|
||||
|
||||
yumrepo { 'ext-ceph-noarch':
|
||||
# puppet versions prior to 3.5 do not support ensure, use enabled instead
|
||||
enabled => $enabled,
|
||||
descr => 'External Ceph noarch',
|
||||
name => "ext-ceph-${release}-noarch",
|
||||
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/noarch",
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'https://download.ceph.com/keys/release.asc',
|
||||
mirrorlist => absent,
|
||||
priority => '10', # prefer ceph repos over EPEL
|
||||
tag => 'ceph',
|
||||
}
|
||||
|
||||
if $fastcgi {
|
||||
yumrepo { 'ext-ceph-fastcgi':
|
||||
enabled => $enabled,
|
||||
descr => 'FastCGI basearch packages for Ceph',
|
||||
name => 'ext-ceph-fastcgi',
|
||||
baseurl => "http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel${el}-x86_64-basic/ref/master",
|
||||
gpgcheck => '1',
|
||||
gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
|
||||
mirrorlist => absent,
|
||||
priority => '20', # prefer ceph repos over EPEL
|
||||
tag => 'ceph',
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# prefer ceph.com repos over EPEL
|
||||
|
|
Loading…
Reference in New Issue