diff --git a/examples/common.yaml b/examples/common.yaml index 89cfe01e..a9f951d7 100644 --- a/examples/common.yaml +++ b/examples/common.yaml @@ -1,6 +1,6 @@ --- ######## Ceph -ceph::profile::params::release: 'luminous' +ceph::profile::params::release: 'mimic' ######## Ceph.conf ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' diff --git a/manifests/osds.pp b/manifests/osds.pp index 187e60be..92caf91c 100644 --- a/manifests/osds.pp +++ b/manifests/osds.pp @@ -31,7 +31,7 @@ # For OSD nodes it is recommended that you raise pid_max above the # default value because you may hit the system max during # 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( $args = {}, diff --git a/manifests/params.pp b/manifests/params.pp index 7ebb007d..6ce1fcac 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -37,7 +37,7 @@ # Optional. Defaults to False # # [*release*] The name of the Ceph release to install -# Optional. Default to 'luminous'. +# Optional. Default to 'mimic'. # class ceph::params ( @@ -45,7 +45,7 @@ class ceph::params ( $packages = ['ceph'], # just provide the minimum per default $rgw_socket_path = '/tmp/radosgw.sock', $enable_sig = false, - $release = 'luminous', + $release = 'mimic', ) { $pkg_mds = 'ceph-mds' diff --git a/manifests/profile/params.pp b/manifests/profile/params.pp index 4e28f84e..9b1927a1 100644 --- a/manifests/profile/params.pp +++ b/manifests/profile/params.pp @@ -155,7 +155,7 @@ # For OSD nodes it is recommended that you raise pid_max above the # default value because you may hit the system max during # 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. # Possible values 'v2.0', 'v3' diff --git a/manifests/repo.pp b/manifests/repo.pp index bb4adaa1..1a6d7dff 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -34,7 +34,7 @@ # Optional. Defaults to 'present'. # # [*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 # 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}/" } yumrepo { 'ceph-luminous-sig': + ensure => 'absent', + } + yumrepo { 'ceph-storage-sig': enabled => '1', baseurl => $ceph_mirror_real, - descr => 'Ceph Luminous SIG', + descr => 'Ceph Storage SIG', mirrorlist => 'absent', gpgcheck => '0', } # 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 { # If you want to deploy Ceph using packages provided by ceph.com repositories. if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0)) diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 3a0559fb..6af35510 100644 --- a/spec/classes/ceph_repo_spec.rb +++ b/spec/classes/ceph_repo_spec.rb @@ -41,7 +41,7 @@ describe 'ceph::repo' do ) } 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', ) } @@ -50,12 +50,12 @@ describe 'ceph::repo' do describe "when overriding ceph mirror" do let :params do { - :ceph_mirror => 'http://myserver.com/debian-luminous/' + :ceph_mirror => 'http://myserver.com/debian-mimic/' } end it { is_expected.to contain_apt__source('ceph').with( - :location => 'http://myserver.com/debian-luminous/', + :location => 'http://myserver.com/debian-mimic/', :release => 'jessie', ) } end @@ -96,7 +96,7 @@ describe 'ceph::repo' do ) } 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', ) } @@ -128,7 +128,7 @@ describe 'ceph::repo' do ) } 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', ) } @@ -151,7 +151,7 @@ describe 'ceph::repo' do it { is_expected.to contain_apt__source('ceph').with( :ensure => 'absent', - :location => 'http://download.ceph.com/debian-luminous/', + :location => 'http://download.ceph.com/debian-mimic/', :release => 'trusty', ) } @@ -194,9 +194,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -206,8 +206,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -297,9 +297,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -312,8 +312,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -348,9 +348,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '0', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -360,8 +360,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '0', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -404,9 +404,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -416,8 +416,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -466,9 +466,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -478,8 +478,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :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-ceph') } it { is_expected.to_not contain_yumrepo('ext-ceph-noarch') } - it { is_expected.to contain_yumrepo('ceph-luminous-sig').with( - :baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/', + it { is_expected.to contain_yumrepo('ceph-luminous-sig').with_ensure('absent') } + it { is_expected.to contain_yumrepo('ceph-storage-sig').with( + :baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-mimic/', ) } 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-ceph') } 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/', ) } end @@ -593,9 +595,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '0', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -605,8 +607,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '0', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -649,9 +651,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph luminous', - :name => 'ext-ceph-luminous', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', + :descr => 'External Ceph mimic', + :name => 'ext-ceph-mimic', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -661,8 +663,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-luminous-noarch', - :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', + :name => 'ext-ceph-mimic-noarch', + :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', diff --git a/spec/fixtures/hieradata/common.yaml b/spec/fixtures/hieradata/common.yaml index 99614017..e8d85bea 100644 --- a/spec/fixtures/hieradata/common.yaml +++ b/spec/fixtures/hieradata/common.yaml @@ -1,6 +1,6 @@ --- ######## Ceph -ceph::profile::params::release: 'luminous' +ceph::profile::params::release: 'mimic' ######## Ceph.conf ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'