Merge "Do not check distro names in each manifests"
This commit is contained in:
commit
1faf235c72
|
@ -61,8 +61,7 @@ class gnocchi::db (
|
|||
'indexer/url': value => $database_connection_real, secret => true;
|
||||
}
|
||||
|
||||
# NOTE(tobasco): gnocchi-indexer-sqlalchemy not packaged in Ubuntu for Queens release.
|
||||
if $::osfamily != 'Debian' {
|
||||
if $::gnocchi::params::indexer_package_name != undef {
|
||||
package { 'gnocchi-indexer-sqlalchemy':
|
||||
ensure => $package_ensure,
|
||||
name => $::gnocchi::params::indexer_package_name,
|
||||
|
|
|
@ -29,10 +29,11 @@ class gnocchi::params {
|
|||
}
|
||||
'Debian': {
|
||||
$sqlite_package_name = 'python-pysqlite2'
|
||||
$indexer_package_name = undef
|
||||
$gnocchi_wsgi_script_path = '/usr/lib/cgi-bin/gnocchi'
|
||||
$pymysql_package_name = "python${pyvers}-pymysql"
|
||||
$redis_package_name = "python${pyvers}-redis"
|
||||
$cradox_package_name = undef
|
||||
$redis_package_name = "python${pyvers}-redis"
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
|
||||
|
|
|
@ -74,8 +74,8 @@ class gnocchi::storage::ceph(
|
|||
}
|
||||
|
||||
if $manage_cradox {
|
||||
if $::osfamily == 'Debian' {
|
||||
fail('gnocchi::storage::ceph::manage_cradox set to true on debian family will fail due to no package being available.')
|
||||
if $::gnocchi::params::cradox_package_name == undef {
|
||||
fail('gnocchi::storage::ceph::manage_cradox set to true will fail due to no package being available.')
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -89,22 +89,18 @@ class gnocchi::storage::ceph(
|
|||
}
|
||||
|
||||
if $manage_cradox {
|
||||
if $::gnocchi::params::common_package_name {
|
||||
ensure_packages('python-cradox', {
|
||||
'ensure' => 'present',
|
||||
'name' => $::gnocchi::params::cradox_package_name,
|
||||
'tag' => ['openstack','gnocchi-package'],
|
||||
})
|
||||
}
|
||||
ensure_packages('python-cradox', {
|
||||
'ensure' => 'present',
|
||||
'name' => $::gnocchi::params::cradox_package_name,
|
||||
'tag' => ['openstack','gnocchi-package'],
|
||||
})
|
||||
}
|
||||
|
||||
if $manage_rados {
|
||||
if $::gnocchi::params::common_package_name {
|
||||
ensure_packages('python-rados', {
|
||||
'ensure' => 'present',
|
||||
'name' => $::gnocchi::params::rados_package_name,
|
||||
'tag' => ['openstack','gnocchi-package'],
|
||||
})
|
||||
}
|
||||
ensure_packages('python-rados', {
|
||||
'ensure' => 'present',
|
||||
'name' => $::gnocchi::params::rados_package_name,
|
||||
'tag' => ['openstack','gnocchi-package'],
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -98,7 +98,7 @@ describe 'gnocchi::storage::ceph' do
|
|||
})
|
||||
end
|
||||
|
||||
it { is_expected.to raise_error(Puppet::Error, /gnocchi::storage::ceph::manage_cradox set to true on debian family will fail due to no package being available./) }
|
||||
it { is_expected.to raise_error(Puppet::Error, /gnocchi::storage::ceph::manage_cradox set to true will fail due to no package being available./) }
|
||||
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue