openstack/puppet-openstack-integration
Code Issues Proposed changes

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

Browse Source 
This patch will change the way we deployed Ceph on CentOS nodes.

* Use CentOS SIG by default
https://wiki.centos.org/SpecialInterestGroup/Storage/

* Stop deploying EPEL, which is conflicting with RDO packaging.

All our CI needs should be in RDO and SIG. Let's stop deploying EPEL at
all.

Depends-On: Ic42c19b2b5b4bc499565c69c3053395173c29a8e
Change-Id: I8d435a77c41c38354b20a40ab30dbc595cb6412c
This commit is contained in:
Emilien Macchi 2016-04-12 14:25:58 -04:00
parent 625da96a42
commit cb015ed05b
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': class { '::ceph::profile::params':
fsid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c', fsid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
manage_repo => false, # repo already managed in openstack_integration::repo
ms_bind_ipv6 => $ms_bind_ipv6, ms_bind_ipv6 => $ms_bind_ipv6,
authentication_type => 'cephx', authentication_type => 'cephx',
mon_host => $::openstack_integration::config::ip_for_url, mon_host => $::openstack_integration::config::ip_for_url,

23
manifests/repos.pp
View File

@ -18,11 +18,9 @@ class openstack_integration::repos {
} }
'RedHat': { 'RedHat': {
class { '::openstack_extras::repo::redhat::redhat': class { '::openstack_extras::repo::redhat::redhat':
# yum-plugin-priorities is already managed by ::ceph::repo manage_rdo => false,
manage_priorities => false, manage_epel => false,
manage_rdo => false, repo_hash => {
manage_epel => false,
repo_hash => {
'mitaka-current' => { 'mitaka-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-mitaka/1c/82/1c829f367c2e67aa3a127342c59e0022266109c7_0e55db37/', 'baseurl' => 'https://trunk.rdoproject.org/centos7-mitaka/1c/82/1c829f367c2e67aa3a127342c59e0022266109c7_0e55db37/',
'descr' => 'Mitaka current', '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,
}
} }