From 5fbe54f026ec4094c09b260b6042367d9089fe71 Mon Sep 17 00:00:00 2001 From: David Gurtner Date: Mon, 8 Feb 2016 21:56:54 +0100 Subject: [PATCH] Update supported version information This updates the supported versions to what is supported by Ceph starting with infernalis. * CentOS 7 or later * Debian Jessie 8.x or later * Ubuntu Trusty 14.04 or later * Fedora 22 or later Change-Id: I9b190f9e928dbafb41477d939032390144fb0e5f --- README.md | 7 +++++++ metadata.json | 8 ++++---- spec/classes/ceph_profile_base_spec.rb | 2 +- spec/classes/ceph_profile_client_spec.rb | 2 +- spec/classes/ceph_profile_mon_spec.rb | 2 +- spec/classes/ceph_profile_osd_spec.rb | 2 +- spec/classes/ceph_profile_params_spec.rb | 2 +- spec/classes/ceph_repo_spec.rb | 6 +++--- spec/defines/ceph_rgw_keystone_spec.rb | 4 ++-- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 63e5b449..f141985e 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,13 @@ A [blueprint](https://wiki.openstack.org/wiki/Puppet-openstack/ceph-blueprint) c Limitations ----------- +We follow the OS compatibility of Ceph. With the release of infernalis this is currently: + +* CentOS 7 or later +* Debian Jessie 8.x or later +* Ubuntu Trusty 14.04 or later +* Fedora 22 or later + Use Cases --------- diff --git a/metadata.json b/metadata.json index 4f70061d..47924472 100644 --- a/metadata.json +++ b/metadata.json @@ -14,19 +14,19 @@ "operatingsystem_support": [ { "operatingsystem": "Debian", - "operatingsystemrelease": ["6","7"] + "operatingsystemrelease": ["8"] }, { "operatingsystem": "Fedora", - "operatingsystemrelease": ["20"] + "operatingsystemrelease": ["22","23"] }, { "operatingsystem": "RedHat", - "operatingsystemrelease": ["5","6","7"] + "operatingsystemrelease": ["7"] }, { "operatingsystem": "Ubuntu", - "operatingsystemrelease": ["12.04","14.04"] + "operatingsystemrelease": ["14.04"] } ], "description": "Installs and configures Ceph.", diff --git a/spec/classes/ceph_profile_base_spec.rb b/spec/classes/ceph_profile_base_spec.rb index 976dacf1..bfb8ea79 100644 --- a/spec/classes/ceph_profile_base_spec.rb +++ b/spec/classes/ceph_profile_base_spec.rb @@ -42,7 +42,7 @@ describe 'ceph::profile::base' do { :osfamily => 'Debian', :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy' + :lsbdistcodename => 'jessie' } end diff --git a/spec/classes/ceph_profile_client_spec.rb b/spec/classes/ceph_profile_client_spec.rb index 2174392c..f89b580c 100644 --- a/spec/classes/ceph_profile_client_spec.rb +++ b/spec/classes/ceph_profile_client_spec.rb @@ -95,7 +95,7 @@ describe 'ceph::profile::client' do { :osfamily => 'Debian', :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', + :lsbdistcodename => 'jessie', :operatingsystem => 'Debian', } end diff --git a/spec/classes/ceph_profile_mon_spec.rb b/spec/classes/ceph_profile_mon_spec.rb index f8fd73ae..60bb531e 100644 --- a/spec/classes/ceph_profile_mon_spec.rb +++ b/spec/classes/ceph_profile_mon_spec.rb @@ -67,7 +67,7 @@ describe 'ceph::profile::mon' do { :osfamily => 'Debian', :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', + :lsbdistcodename => 'jessie', :operatingsystem => 'Debian', :hostname => 'first', } diff --git a/spec/classes/ceph_profile_osd_spec.rb b/spec/classes/ceph_profile_osd_spec.rb index 8a274b33..1aa97abe 100644 --- a/spec/classes/ceph_profile_osd_spec.rb +++ b/spec/classes/ceph_profile_osd_spec.rb @@ -48,7 +48,7 @@ describe 'ceph::profile::osd' do { :osfamily => 'Debian', :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', + :lsbdistcodename => 'jessie', :operatingsystem => 'Debian', } end diff --git a/spec/classes/ceph_profile_params_spec.rb b/spec/classes/ceph_profile_params_spec.rb index 708ab04c..2eabc7dc 100644 --- a/spec/classes/ceph_profile_params_spec.rb +++ b/spec/classes/ceph_profile_params_spec.rb @@ -51,7 +51,7 @@ describe 'ceph::profile::params' do let :facts do { :osfamily => 'Debian', - :lsbdistcodename => 'wheezy' + :lsbdistcodename => 'jessie' } end diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 898a8777..1003e0cf 100644 --- a/spec/classes/ceph_repo_spec.rb +++ b/spec/classes/ceph_repo_spec.rb @@ -27,7 +27,7 @@ describe 'ceph::repo' do { :osfamily => 'Debian', :lsbdistid => 'Debian', - :lsbdistcodename => 'wheezy', + :lsbdistcodename => 'jessie', } end @@ -40,7 +40,7 @@ describe 'ceph::repo' do it { is_expected.to contain_apt__source('ceph').with( :location => 'http://download.ceph.com/debian-hammer/', - :release => 'wheezy', + :release => 'jessie', :require => 'Apt::Key[ceph]' ) } @@ -55,7 +55,7 @@ describe 'ceph::repo' do it { is_expected.to contain_apt__source('ceph').with( :location => 'http://download.ceph.com/debian-firefly/', - :release => 'wheezy', + :release => 'jessie', :require => 'Apt::Key[ceph]' ) } end diff --git a/spec/defines/ceph_rgw_keystone_spec.rb b/spec/defines/ceph_rgw_keystone_spec.rb index 5c565f79..ec4b0a5d 100644 --- a/spec/defines/ceph_rgw_keystone_spec.rb +++ b/spec/defines/ceph_rgw_keystone_spec.rb @@ -28,7 +28,7 @@ describe 'ceph::rgw::keystone' do :fqdn => 'myhost.domain', :hostname => 'myhost', :lsbdistid => 'Ubuntu', - :lsbdistcodename => 'precise', + :lsbdistcodename => 'trusty', :osfamily => 'Debian', :operatingsystem => 'Ubuntu', :operatingsystemrelease => '14.04', @@ -145,7 +145,7 @@ openssl x509 -in /tmp/signing -pubkey | certutil -A -d /some/path/to/nss -n sign :concat_basedir => '/var/lib/puppet/concat', :fqdn => 'myhost.domain', :hostname => 'myhost', - :lsbdistcodename => 'Final', + :lsbdistcodename => 'Maipo', :osfamily => 'RedHat', :operatingsystem => 'RedHat', :operatingsystemrelease => '7.2',