openstack/puppet-ceph
Code Issues Proposed changes

Merge "Add Mimic support"

Browse Source
This commit is contained in:
Zuul 2018-06-29 16:40:34 +00:00 committed by Gerrit Code Review
commit 2eaec44cb0
7 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/common.yaml
View File

@ -1,6 +1,6 @@
--- ---
######## Ceph ######## Ceph
ceph::profile::params::release: 'luminous' ceph::profile::params::release: 'mimic'
######## Ceph.conf ######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'

2
manifests/osds.pp
View File

@ -31,7 +31,7 @@
# For OSD nodes it is recommended that you raise pid_max above the # For OSD nodes it is recommended that you raise pid_max above the
# default value because you may hit the system max during # default value because you may hit the system max during
# recovery. The recommended value is the absolute max for pid_max: 4194303 # recovery. The recommended value is the absolute max for pid_max: 4194303
# http://docs.ceph.com/docs/luminous/rados/troubleshooting/troubleshooting-osd/ # http://docs.ceph.com/docs/mimic/rados/troubleshooting/troubleshooting-osd/
# #
class ceph::osds( class ceph::osds(
$args = {}, $args = {},

4
manifests/params.pp
View File

@ -37,7 +37,7 @@
# Optional. Defaults to False # Optional. Defaults to False
# #
# [*release*] The name of the Ceph release to install # [*release*] The name of the Ceph release to install
# Optional. Default to 'luminous'. # Optional. Default to 'mimic'.
# #
class ceph::params ( class ceph::params (
@ -45,7 +45,7 @@ class ceph::params (
$packages = ['ceph'], # just provide the minimum per default $packages = ['ceph'], # just provide the minimum per default
$rgw_socket_path = '/tmp/radosgw.sock', $rgw_socket_path = '/tmp/radosgw.sock',
$enable_sig = false, $enable_sig = false,
$release = 'luminous', $release = 'mimic',
) { ) {
$pkg_mds = 'ceph-mds' $pkg_mds = 'ceph-mds'

2
manifests/profile/params.pp
View File

@ -155,7 +155,7 @@
# For OSD nodes it is recommended that you raise pid_max above the # For OSD nodes it is recommended that you raise pid_max above the
# default value because you may hit the system max during # default value because you may hit the system max during
# recovery. The recommended value is the absolute max for pid_max: 4194303 # recovery. The recommended value is the absolute max for pid_max: 4194303
# http://docs.ceph.com/docs/luminous/rados/troubleshooting/troubleshooting-osd/ # http://docs.ceph.com/docs/mimic/rados/troubleshooting/troubleshooting-osd/
# #
# [*rgw_keystone_version*] The api version for keystone. # [*rgw_keystone_version*] The api version for keystone.
# Possible values 'v2.0', 'v3' # Possible values 'v2.0', 'v3'

9
manifests/repo.pp
View File

@ -34,7 +34,7 @@
# Optional. Defaults to 'present'. # Optional. Defaults to 'present'.
# #
# [*release*] The name of the Ceph release to install # [*release*] The name of the Ceph release to install
# Optional. Default to 'luminous' in ceph::params. # Optional. Default to 'mimic' in ceph::params.
# #
# [*fastcgi*] Install Ceph fastcgi apache module for Ceph # [*fastcgi*] Install Ceph fastcgi apache module for Ceph
# Optional. Defaults to 'false' # Optional. Defaults to 'false'
@ -130,14 +130,17 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
$ceph_mirror_real = "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${release}/" $ceph_mirror_real = "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${release}/"
} }
yumrepo { 'ceph-luminous-sig': yumrepo { 'ceph-luminous-sig':
ensure => 'absent',
}
yumrepo { 'ceph-storage-sig':
enabled => '1', enabled => '1',
baseurl => $ceph_mirror_real, baseurl => $ceph_mirror_real,
descr => 'Ceph Luminous SIG', descr => 'Ceph Storage SIG',
mirrorlist => 'absent', mirrorlist => 'absent',
gpgcheck => '0', gpgcheck => '0',
} }
# Make sure we install the repo before any Package resource # Make sure we install the repo before any Package resource
Yumrepo['ceph-luminous-sig'] -> Package<| tag == 'ceph' |> Yumrepo['ceph-luminous-sig'] -> Yumrepo['ceph-storage-sig'] -> Package<| tag == 'ceph' |>
} else { } else {
# If you want to deploy Ceph using packages provided by ceph.com repositories. # If you want to deploy Ceph using packages provided by ceph.com repositories.
if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0)) if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0))

90
spec/classes/ceph_repo_spec.rb
View File

@ -41,7 +41,7 @@ describe 'ceph::repo' do
) } ) }
it { is_expected.to contain_apt__source('ceph').with( it { is_expected.to contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-luminous/', :location => 'http://download.ceph.com/debian-mimic/',
:release => 'jessie', :release => 'jessie',
) } ) }
@ -50,12 +50,12 @@ describe 'ceph::repo' do
describe "when overriding ceph mirror" do describe "when overriding ceph mirror" do
let :params do let :params do
{ {
:ceph_mirror => 'http://myserver.com/debian-luminous/' :ceph_mirror => 'http://myserver.com/debian-mimic/'
} }
end end
it { is_expected.to contain_apt__source('ceph').with( it { is_expected.to contain_apt__source('ceph').with(
:location => 'http://myserver.com/debian-luminous/', :location => 'http://myserver.com/debian-mimic/',
:release => 'jessie', :release => 'jessie',
) } ) }
end end
@ -96,7 +96,7 @@ describe 'ceph::repo' do
) } ) }
it { is_expected.to contain_apt__source('ceph').with( it { is_expected.to contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-luminous/', :location => 'http://download.ceph.com/debian-mimic/',
:release => 'trusty', :release => 'trusty',
) } ) }
@ -128,7 +128,7 @@ describe 'ceph::repo' do
) } ) }
it { is_expected.to contain_apt__source('ceph').with( it { is_expected.to contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-luminous/', :location => 'http://download.ceph.com/debian-mimic/',
:release => 'trusty', :release => 'trusty',
) } ) }
@ -151,7 +151,7 @@ describe 'ceph::repo' do
it { is_expected.to contain_apt__source('ceph').with( it { is_expected.to contain_apt__source('ceph').with(
:ensure => 'absent', :ensure => 'absent',
:location => 'http://download.ceph.com/debian-luminous/', :location => 'http://download.ceph.com/debian-mimic/',
:release => 'trusty', :release => 'trusty',
) } ) }
@ -194,9 +194,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -206,8 +206,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -297,9 +297,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -312,8 +312,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -348,9 +348,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -360,8 +360,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -404,9 +404,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -416,8 +416,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -466,9 +466,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -478,8 +478,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -547,8 +547,9 @@ describe 'ceph::repo' do
it { is_expected.to_not contain_yumrepo('ext-epel-7') } it { is_expected.to_not contain_yumrepo('ext-epel-7') }
it { is_expected.to_not contain_yumrepo('ext-ceph') } it { is_expected.to_not contain_yumrepo('ext-ceph') }
it { is_expected.to_not contain_yumrepo('ext-ceph-noarch') } it { is_expected.to_not contain_yumrepo('ext-ceph-noarch') }
it { is_expected.to contain_yumrepo('ceph-luminous-sig').with( it { is_expected.to contain_yumrepo('ceph-luminous-sig').with_ensure('absent') }
:baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/', it { is_expected.to contain_yumrepo('ceph-storage-sig').with(
:baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-mimic/',
) } ) }
end end
@ -564,7 +565,8 @@ describe 'ceph::repo' do
it { is_expected.to_not contain_yumrepo('ext-epel-7') } it { is_expected.to_not contain_yumrepo('ext-epel-7') }
it { is_expected.to_not contain_yumrepo('ext-ceph') } it { is_expected.to_not contain_yumrepo('ext-ceph') }
it { is_expected.to_not contain_yumrepo('ext-ceph-noarch') } it { is_expected.to_not contain_yumrepo('ext-ceph-noarch') }
it { is_expected.to contain_yumrepo('ceph-luminous-sig').with( it { is_expected.to contain_yumrepo('ceph-luminous-sig').with_ensure('absent') }
it { is_expected.to contain_yumrepo('ceph-storage-sig').with(
:baseurl => 'https://mymirror/luminous/', :baseurl => 'https://mymirror/luminous/',
) } ) }
end end
@ -593,9 +595,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -605,8 +607,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -649,9 +651,9 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph').with( it { is_expected.to contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph luminous', :descr => 'External Ceph mimic',
:name => 'ext-ceph-luminous', :name => 'ext-ceph-mimic',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',
@ -661,8 +663,8 @@ describe 'ceph::repo' do
it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( it { is_expected.to contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-luminous-noarch', :name => 'ext-ceph-mimic-noarch',
:baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
:gpgcheck => '1', :gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc', :gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent', :mirrorlist => 'absent',

2
spec/fixtures/hieradata/common.yaml vendored
View File

@ -1,6 +1,6 @@
--- ---
######## Ceph ######## Ceph
ceph::profile::params::release: 'luminous' ceph::profile::params::release: 'mimic'
######## Ceph.conf ######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'