openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "repos/centos: deploy Ceph with SIG and get rid of EPEL"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 11:03:40 +00:00 committed by Gerrit Code Review
commit 7aa11a00cc
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/ceph.pp
View File

@ -10,6 +10,7 @@ class openstack_integration::ceph {
class { '::ceph::profile::params':
fsid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
manage_repo => false, # repo already managed in openstack_integration::repo
ms_bind_ipv6 => $ms_bind_ipv6,
authentication_type => 'cephx',
mon_host => $::openstack_integration::config::ip_for_url,

23
manifests/repos.pp
View File

@ -18,11 +18,9 @@ class openstack_integration::repos {
}
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
# yum-plugin-priorities is already managed by ::ceph::repo
manage_priorities => false,
manage_rdo => false,
manage_epel => false,
repo_hash => {
manage_rdo => false,
manage_epel => false,
repo_hash => {
'mitaka-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-mitaka/25/aa/25aae034738eda7c00fb3745aa85b96c6768c0f8_8ba4c30b/',
'descr' => 'Mitaka current',
@ -43,6 +41,19 @@ class openstack_integration::repos {
}
}
class { '::ceph::repo': }
# On CentOS, deploy Ceph using SIG repository and get rid of EPEL.
# https://wiki.centos.org/SpecialInterestGroup/Storage/
if $::operatingsystem == 'CentOS' {
$enable_sig = true
$enable_epel = false
} else {
$enable_sig = false
$enable_epel = true
}
class { '::ceph::repo':
enable_sig => $enable_sig,
enable_epel => $enable_epel,
}
}