From 710364b405fdaf5ff44142563a80450a60938e12 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 27 Sep 2017 10:41:56 -0400 Subject: [PATCH] Add Luminous support for CentOS Change-Id: Ic4d4219892d13d7a9c1b06c1fc19d512a3996032 --- examples/common.yaml | 2 +- manifests/osds.pp | 2 +- manifests/params.pp | 4 +- manifests/profile/params.pp | 2 +- manifests/repo.pp | 8 +- .../add-luminous-centos-e038729331945b61.yaml | 3 + spec/acceptance/ceph_mon_osd_spec.rb | 60 +++++------- spec/classes/ceph_repo_spec.rb | 92 +++++++++---------- spec/fixtures/hieradata/common.yaml | 2 +- 9 files changed, 84 insertions(+), 91 deletions(-) create mode 100644 releasenotes/notes/add-luminous-centos-e038729331945b61.yaml diff --git a/examples/common.yaml b/examples/common.yaml index 0ab98c66..89cfe01e 100644 --- a/examples/common.yaml +++ b/examples/common.yaml @@ -1,6 +1,6 @@ --- ######## Ceph -ceph::profile::params::release: 'jewel' +ceph::profile::params::release: 'luminous' ######## Ceph.conf ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' diff --git a/manifests/osds.pp b/manifests/osds.pp index 600ec991..187e60be 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/jewel/rados/troubleshooting/troubleshooting-osd/ +# http://docs.ceph.com/docs/luminous/rados/troubleshooting/troubleshooting-osd/ # class ceph::osds( $args = {}, diff --git a/manifests/params.pp b/manifests/params.pp index c3b6582a..7ebb007d 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 'jewel'. +# Optional. Default to 'luminous'. # 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 = 'jewel', + $release = 'luminous', ) { $pkg_mds = 'ceph-mds' diff --git a/manifests/profile/params.pp b/manifests/profile/params.pp index 8f6f7393..4e28f84e 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/jewel/rados/troubleshooting/troubleshooting-osd/ +# http://docs.ceph.com/docs/luminous/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 89fb482d..bb4adaa1 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 'jewel' in ceph::params. +# Optional. Default to 'luminous' in ceph::params. # # [*fastcgi*] Install Ceph fastcgi apache module for Ceph # Optional. Defaults to 'false' @@ -129,15 +129,15 @@ not on ${::operatingsystem}, which can lead to packaging issues.") } else { $ceph_mirror_real = "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${release}/" } - yumrepo { 'ceph-jewel-sig': + yumrepo { 'ceph-luminous-sig': enabled => '1', baseurl => $ceph_mirror_real, - descr => 'Ceph Jewel SIG', + descr => 'Ceph Luminous SIG', mirrorlist => 'absent', gpgcheck => '0', } # Make sure we install the repo before any Package resource - Yumrepo['ceph-jewel-sig'] -> Package<| tag == 'ceph' |> + Yumrepo['ceph-luminous-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/releasenotes/notes/add-luminous-centos-e038729331945b61.yaml b/releasenotes/notes/add-luminous-centos-e038729331945b61.yaml new file mode 100644 index 00000000..b48bb289 --- /dev/null +++ b/releasenotes/notes/add-luminous-centos-e038729331945b61.yaml @@ -0,0 +1,3 @@ +--- +features: + - Added Luminous support for modules \ No newline at end of file diff --git a/spec/acceptance/ceph_mon_osd_spec.rb b/spec/acceptance/ceph_mon_osd_spec.rb index 9e8108c8..18f5466c 100644 --- a/spec/acceptance/ceph_mon_osd_spec.rb +++ b/spec/acceptance/ceph_mon_osd_spec.rb @@ -23,41 +23,31 @@ describe 'ceph mon osd' do it 'should install one monitor and one OSD on /srv/data' do pp = <<-EOS - if $::operatingsystem == 'CentOS' { - class { 'ceph::repo': - release => 'jewel', - enable_sig => true, - enable_epel => false, - ceph_mirror => $ceph_mirror, - } - class { 'ceph': - fsid => '82274746-9a2c-426b-8c51-107fb0d890c6', - mon_host => $::ipaddress, - authentication_type => 'none', - osd_pool_default_size => '1', - osd_pool_default_min_size => '1', - osd_max_object_namespace_len => '64', - osd_max_object_name_len => '256', - } - ceph_config { - 'global/osd_journal_size': value => '100'; - } - - # NOTE(mnaser): At the moment, the storage SIG packages do not ship 12.X - # however UCA is shipping it at the moment. This conditional - # should be dropped once we switch CentOS to 12.X - if $::osfamily != 'RedHat' { - ceph::mgr { 'a': - authentication_type => 'none', - } - } - - ceph::mon { 'a': - public_addr => $::ipaddress, - authentication_type => 'none', - } - ceph::osd { '/srv/data': } + class { 'ceph::repo': + enable_sig => true, + enable_epel => false, + ceph_mirror => $ceph_mirror, } + class { 'ceph': + fsid => '82274746-9a2c-426b-8c51-107fb0d890c6', + mon_host => $::ipaddress, + authentication_type => 'none', + osd_pool_default_size => '1', + osd_pool_default_min_size => '1', + osd_max_object_namespace_len => '64', + osd_max_object_name_len => '256', + } + ceph_config { + 'global/osd_journal_size': value => '100'; + } + ceph::mgr { 'a': + authentication_type => 'none', + } + ceph::mon { 'a': + public_addr => $::ipaddress, + authentication_type => 'none', + } + ceph::osd { '/srv/data': } EOS apply_manifest(pp, :catch_failures => true) @@ -67,7 +57,7 @@ describe 'ceph mon osd' do shell 'sleep 10' # we need to wait a bit until the OSD is up shell 'ceph -s', { :acceptable_exit_codes => [0] } do |r| - expect(r.stdout).to match(/1 mons at/) + expect(r.stdout).to match(/mon: 1 daemons/) expect(r.stderr).to be_empty end diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 7d1d5382..3a0559fb 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-jewel/', + :location => 'http://download.ceph.com/debian-luminous/', :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-jewel/' + :ceph_mirror => 'http://myserver.com/debian-luminous/' } end it { is_expected.to contain_apt__source('ceph').with( - :location => 'http://myserver.com/debian-jewel/', + :location => 'http://myserver.com/debian-luminous/', :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-jewel/', + :location => 'http://download.ceph.com/debian-luminous/', :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-jewel/', + :location => 'http://download.ceph.com/debian-luminous/', :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-jewel/', + :location => 'http://download.ceph.com/debian-luminous/', :release => 'trusty', ) } @@ -194,9 +194,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/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-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/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 jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/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-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/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 jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/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-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/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 jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/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-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/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 jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/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-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -547,8 +547,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-jewel-sig').with( - :baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-jewel/', + it { is_expected.to contain_yumrepo('ceph-luminous-sig').with( + :baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-luminous/', ) } end @@ -556,7 +556,7 @@ describe 'ceph::repo' do let :params do { :enable_sig => true, - :ceph_mirror => 'https://mymirror/jewel/', + :ceph_mirror => 'https://mymirror/luminous/', } end @@ -564,8 +564,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-jewel-sig').with( - :baseurl => 'https://mymirror/jewel/', + it { is_expected.to contain_yumrepo('ceph-luminous-sig').with( + :baseurl => 'https://mymirror/luminous/', ) } end @@ -593,9 +593,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '0', - :descr => 'External Ceph jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -605,8 +605,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '0', :descr => 'External Ceph noarch', - :name => 'ext-ceph-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/el7/noarch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -649,9 +649,9 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph').with( :enabled => '1', - :descr => 'External Ceph jewel', - :name => 'ext-ceph-jewel', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/$basearch', + :descr => 'External Ceph luminous', + :name => 'ext-ceph-luminous', + :baseurl => 'http://download.ceph.com/rpm-luminous/el7/$basearch', :gpgcheck => '1', :gpgkey => 'https://download.ceph.com/keys/release.asc', :mirrorlist => 'absent', @@ -661,8 +661,8 @@ describe 'ceph::repo' do it { is_expected.to contain_yumrepo('ext-ceph-noarch').with( :enabled => '1', :descr => 'External Ceph noarch', - :name => 'ext-ceph-jewel-noarch', - :baseurl => 'http://download.ceph.com/rpm-jewel/el7/noarch', + :name => 'ext-ceph-luminous-noarch', + :baseurl => 'http://download.ceph.com/rpm-luminous/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 0e082fc6..99614017 100644 --- a/spec/fixtures/hieradata/common.yaml +++ b/spec/fixtures/hieradata/common.yaml @@ -1,6 +1,6 @@ --- ######## Ceph -ceph::profile::params::release: 'jewel' +ceph::profile::params::release: 'luminous' ######## Ceph.conf ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'