Merge "Update supported version information"

This commit is contained in:
Jenkins 2016-03-04 19:57:28 +00:00 committed by Gerrit Code Review
commit 535ceb23bc
9 changed files with 21 additions and 14 deletions

View File

@ -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
---------

View File

@ -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.",

View File

@ -42,7 +42,7 @@ describe 'ceph::profile::base' do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'wheezy'
:lsbdistcodename => 'jessie'
}
end

View File

@ -95,7 +95,7 @@ describe 'ceph::profile::client' do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'wheezy',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
}
end

View File

@ -67,7 +67,7 @@ describe 'ceph::profile::mon' do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'wheezy',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
:hostname => 'first',
}

View File

@ -48,7 +48,7 @@ describe 'ceph::profile::osd' do
{
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistcodename => 'wheezy',
:lsbdistcodename => 'jessie',
:operatingsystem => 'Debian',
}
end

View File

@ -51,7 +51,7 @@ describe 'ceph::profile::params' do
let :facts do
{
:osfamily => 'Debian',
:lsbdistcodename => 'wheezy'
:lsbdistcodename => 'jessie'
}
end

View File

@ -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

View File

@ -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',