openstack/puppet-ceph
Code Issues Proposed changes

Change default version to Ceph Nautilus

Browse Source 
Changes the default ceph version on master to
Ceph Nautilus now that we have the stable/mimic
branch.

Change-Id: Ie357d94ab06e0e33bcf890cc83b77b25fe52ffa3
This commit is contained in:
Tobias Urdin
2019-04-04 14:40:37 +02:00
parent 17ed08b3aa
commit 54718a13ac
7 changed files with 49 additions and 49 deletions
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: 'mimic' ceph::profile::params::release: 'nautilus'
######## 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/mimic/rados/troubleshooting/troubleshooting-osd/ # http://docs.ceph.com/docs/nautilus/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 'mimic'. # Optional. Default to 'nautilus'.
# #
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 = 'mimic', $release = 'nautilus',
) { ) {
$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/mimic/rados/troubleshooting/troubleshooting-osd/ # http://docs.ceph.com/docs/nautilus/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'

2
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 'mimic' in ceph::params. # Optional. Default to 'nautilus' 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'

84
spec/classes/ceph_repo_spec.rb
View File

@@ -36,7 +36,7 @@ describe 'ceph::repo' do
)} )}
it { should contain_apt__source('ceph').with( it { should contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-mimic/', :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'jessie', :release => 'jessie',
)} )}
end end
@@ -44,12 +44,12 @@ describe 'ceph::repo' do
context 'when overriding ceph mirror' do context 'when overriding ceph mirror' do
let :params do let :params do
{ {
:ceph_mirror => 'http://myserver.com/debian-mimic/' :ceph_mirror => 'http://myserver.com/debian-nautilus/'
} }
end end
it { should contain_apt__source('ceph').with( it { should contain_apt__source('ceph').with(
:location => 'http://myserver.com/debian-mimic/', :location => 'http://myserver.com/debian-nautilus/',
:release => 'jessie', :release => 'jessie',
)} )}
end end
@@ -85,7 +85,7 @@ describe 'ceph::repo' do
)} )}
it { should contain_apt__source('ceph').with( it { should contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-mimic/', :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty', :release => 'trusty',
)} )}
end end
@@ -116,7 +116,7 @@ describe 'ceph::repo' do
)} )}
it { should contain_apt__source('ceph').with( it { should contain_apt__source('ceph').with(
:location => 'http://download.ceph.com/debian-mimic/', :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty', :release => 'trusty',
)} )}
@@ -138,7 +138,7 @@ describe 'ceph::repo' do
it { should contain_apt__source('ceph').with( it { should contain_apt__source('ceph').with(
:ensure => 'absent', :ensure => 'absent',
:location => 'http://download.ceph.com/debian-mimic/', :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty', :release => 'trusty',
)} )}
@@ -173,9 +173,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -185,8 +185,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -272,9 +272,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -287,8 +287,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -321,9 +321,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -333,8 +333,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -374,9 +374,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -386,8 +386,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -429,9 +429,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -441,8 +441,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -505,7 +505,7 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ceph-luminous-sig').with_ensure('absent') } it { should contain_yumrepo('ceph-luminous-sig').with_ensure('absent') }
it { should contain_yumrepo('ceph-storage-sig').with( it { should contain_yumrepo('ceph-storage-sig').with(
:baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-mimic/', :baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-nautilus/',
)} )}
end end
@@ -549,9 +549,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -561,8 +561,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0', :enabled => '0',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -602,9 +602,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with( it { should contain_yumrepo('ext-ceph').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph mimic', :descr => 'External Ceph nautilus',
:name => 'ext-ceph-mimic', :name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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',
@@ -614,8 +614,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with( it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1', :enabled => '1',
:descr => 'External Ceph noarch', :descr => 'External Ceph noarch',
:name => 'ext-ceph-mimic-noarch', :name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch', :baseurl => 'http://download.ceph.com/rpm-nautilus/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: 'mimic' ceph::profile::params::release: 'nautilus'
######## Ceph.conf ######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'