From 54718a13ac6872108ca87a97c73a908f79dd6b06 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 4 Apr 2019 14:40:37 +0200
Subject: [PATCH] Change default version to Ceph Nautilus
Changes the default ceph version on master to
Ceph Nautilus now that we have the stable/mimic
branch.
Change-Id: Ie357d94ab06e0e33bcf890cc83b77b25fe52ffa3
---
examples/common.yaml | 2 +-
manifests/osds.pp | 2 +-
manifests/params.pp | 4 +-
manifests/profile/params.pp | 2 +-
manifests/repo.pp | 2 +-
spec/classes/ceph_repo_spec.rb | 84 ++++++++++++++---------------
spec/fixtures/hieradata/common.yaml | 2 +-
7 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/examples/common.yaml b/examples/common.yaml
index a9f951d7..0c5c0396 100644
--- a/examples/common.yaml
+++ b/examples/common.yaml
@@ -1,6 +1,6 @@
---
######## Ceph
-ceph::profile::params::release: 'mimic'
+ceph::profile::params::release: 'nautilus'
######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
diff --git a/manifests/osds.pp b/manifests/osds.pp
index 92caf91c..0825ce9f 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/mimic/rados/troubleshooting/troubleshooting-osd/
+# http://docs.ceph.com/docs/nautilus/rados/troubleshooting/troubleshooting-osd/
#
class ceph::osds(
$args = {},
diff --git a/manifests/params.pp b/manifests/params.pp
index f27feb03..67c1c4d2 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 'mimic'.
+# Optional. Default to 'nautilus'.
#
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 = 'mimic',
+ $release = 'nautilus',
) {
$pkg_mds = 'ceph-mds'
diff --git a/manifests/profile/params.pp b/manifests/profile/params.pp
index 1267d141..469d8476 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/mimic/rados/troubleshooting/troubleshooting-osd/
+# http://docs.ceph.com/docs/nautilus/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 c328b20e..e7d2a3ee 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 'mimic' in ceph::params.
+# Optional. Default to 'nautilus' in ceph::params.
#
# [*fastcgi*] Install Ceph fastcgi apache module for Ceph
# Optional. Defaults to 'false'
diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb
index 7ad820cc..170e7c97 100644
--- a/spec/classes/ceph_repo_spec.rb
+++ b/spec/classes/ceph_repo_spec.rb
@@ -36,7 +36,7 @@ describe 'ceph::repo' do
)}
it { should contain_apt__source('ceph').with(
- :location => 'http://download.ceph.com/debian-mimic/',
+ :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'jessie',
)}
end
@@ -44,12 +44,12 @@ describe 'ceph::repo' do
context 'when overriding ceph mirror' do
let :params do
{
- :ceph_mirror => 'http://myserver.com/debian-mimic/'
+ :ceph_mirror => 'http://myserver.com/debian-nautilus/'
}
end
it { should contain_apt__source('ceph').with(
- :location => 'http://myserver.com/debian-mimic/',
+ :location => 'http://myserver.com/debian-nautilus/',
:release => 'jessie',
)}
end
@@ -85,7 +85,7 @@ describe 'ceph::repo' do
)}
it { should contain_apt__source('ceph').with(
- :location => 'http://download.ceph.com/debian-mimic/',
+ :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty',
)}
end
@@ -116,7 +116,7 @@ describe 'ceph::repo' do
)}
it { should contain_apt__source('ceph').with(
- :location => 'http://download.ceph.com/debian-mimic/',
+ :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty',
)}
@@ -138,7 +138,7 @@ describe 'ceph::repo' do
it { should contain_apt__source('ceph').with(
:ensure => 'absent',
- :location => 'http://download.ceph.com/debian-mimic/',
+ :location => 'http://download.ceph.com/debian-nautilus/',
:release => 'trusty',
)}
@@ -173,9 +173,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -185,8 +185,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -272,9 +272,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -287,8 +287,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -321,9 +321,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '0',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -333,8 +333,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -374,9 +374,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -386,8 +386,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -429,9 +429,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -441,8 +441,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
: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-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
@@ -549,9 +549,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '0',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -561,8 +561,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '0',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -602,9 +602,9 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph').with(
:enabled => '1',
- :descr => 'External Ceph mimic',
- :name => 'ext-ceph-mimic',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/$basearch',
+ :descr => 'External Ceph nautilus',
+ :name => 'ext-ceph-nautilus',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@@ -614,8 +614,8 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ext-ceph-noarch').with(
:enabled => '1',
:descr => 'External Ceph noarch',
- :name => 'ext-ceph-mimic-noarch',
- :baseurl => 'http://download.ceph.com/rpm-mimic/el7/noarch',
+ :name => 'ext-ceph-nautilus-noarch',
+ :baseurl => 'http://download.ceph.com/rpm-nautilus/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 e8d85bea..270e3afe 100644
--- a/spec/fixtures/hieradata/common.yaml
+++ b/spec/fixtures/hieradata/common.yaml
@@ -1,6 +1,6 @@
---
######## Ceph
-ceph::profile::params::release: 'mimic'
+ceph::profile::params::release: 'nautilus'
######## Ceph.conf
ceph::profile::params::fsid: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'