From cb015ed05b2105daa53262297dd3da05786f4f9e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 12 Apr 2016 14:25:58 -0400 Subject: [PATCH] repos/centos: deploy Ceph with SIG and get rid of EPEL 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 --- manifests/ceph.pp | 1 + manifests/repos.pp | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/manifests/ceph.pp b/manifests/ceph.pp index e30f344a4..e040ba662 100644 --- a/manifests/ceph.pp +++ b/manifests/ceph.pp @@ -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, diff --git a/manifests/repos.pp b/manifests/repos.pp index 8f5af4828..f55be06ba 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -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/1c/82/1c829f367c2e67aa3a127342c59e0022266109c7_0e55db37/', '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, + } }