openstack
/
puppet-gnocchi
Code Issues Proposed changes

Rename openstack-gnocchi to gnocchi 

Change-Id: Icedf71915b44294c1260fecea87b27ec9e6086c5
Closes-Bug: #1741144
This commit is contained in:
Emilien Macchi 2018-01-03 16:17:10 -08:00
parent 41f252f645
commit 2271915bb9
5 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/params.pp
View File

@ -5,20 +5,20 @@
class gnocchi::params {
include ::openstacklib::defaults
$client_package_name = 'python-gnocchiclient'
$rados_package_name = 'python-rados'
$client_package_name = 'python-gnocchiclient'
$rados_package_name = 'python-rados'
$common_package_name = 'gnocchi-common'
$api_package_name = 'gnocchi-api'
$api_service_name = 'gnocchi-api'
$metricd_package_name = 'gnocchi-metricd'
$metricd_service_name = 'gnocchi-metricd'
$statsd_package_name = 'gnocchi-statsd'
$statsd_service_name = 'gnocchi-statsd'
case $::osfamily {
'RedHat': {
$sqlite_package_name = undef
$common_package_name = 'openstack-gnocchi-common'
$api_package_name = 'openstack-gnocchi-api'
$api_service_name = 'openstack-gnocchi-api'
$indexer_package_name = 'openstack-gnocchi-indexer-sqlalchemy'
$metricd_package_name = 'openstack-gnocchi-metricd'
$metricd_service_name = 'openstack-gnocchi-metricd'
$statsd_package_name = 'openstack-gnocchi-statsd'
$statsd_service_name = 'openstack-gnocchi-statsd'
$gnocchi_wsgi_script_path = '/var/www/cgi-bin/gnocchi'
$gnocchi_wsgi_script_source = '/usr/bin/gnocchi-api'
$pymysql_package_name = undef
@ -27,13 +27,6 @@ class gnocchi::params {
}
'Debian': {
$sqlite_package_name = 'python-pysqlite2'
$common_package_name = 'gnocchi-common'
$api_package_name = 'gnocchi-api'
$api_service_name = 'gnocchi-api'
$metricd_package_name = 'gnocchi-metricd'
$metricd_service_name = 'gnocchi-metricd'
$statsd_package_name = 'gnocchi-statsd'
$statsd_service_name = 'gnocchi-statsd'
$gnocchi_wsgi_script_path = '/usr/lib/cgi-bin/gnocchi'
$gnocchi_wsgi_script_source = '/usr/share/gnocchi-common/app.wsgi'
$pymysql_package_name = 'python-pymysql'

10
spec/classes/gnocchi_api_spec.rb
View File

@ -149,14 +149,8 @@ describe 'gnocchi::api' do
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :api_package_name => 'gnocchi-api',
:api_service_name => 'gnocchi-api' }
when 'RedHat'
{ :api_package_name => 'openstack-gnocchi-api',
:api_service_name => 'openstack-gnocchi-api' }
end
{ :api_package_name => 'gnocchi-api',
:api_service_name => 'gnocchi-api' }
end
it_behaves_like 'gnocchi-api'
end

2
spec/classes/gnocchi_init_spec.rb
View File

@ -44,7 +44,7 @@ describe 'gnocchi' do
when 'Debian'
{ :gnocchi_common_package => 'gnocchi-common' }
when 'RedHat'
{ :gnocchi_common_package => 'openstack-gnocchi-common' }
{ :gnocchi_common_package => 'gnocchi-common' }
end
end
it_behaves_like 'gnocchi'

10
spec/classes/gnocchi_metricd_spec.rb
View File

@ -96,14 +96,8 @@ describe 'gnocchi::metricd' do
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :metricd_package_name => 'gnocchi-metricd',
:metricd_service_name => 'gnocchi-metricd' }
when 'RedHat'
{ :metricd_package_name => 'openstack-gnocchi-metricd',
:metricd_service_name => 'openstack-gnocchi-metricd' }
end
{ :metricd_package_name => 'gnocchi-metricd',
:metricd_service_name => 'gnocchi-metricd' }
end
it_behaves_like 'gnocchi-metricd'
end

10
spec/classes/gnocchi_statsd_spec.rb
View File

@ -78,14 +78,8 @@ describe 'gnocchi::statsd' do
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :statsd_package_name => 'gnocchi-statsd',
:statsd_service_name => 'gnocchi-statsd' }
when 'RedHat'
{ :statsd_package_name => 'openstack-gnocchi-statsd',
:statsd_service_name => 'openstack-gnocchi-statsd' }
end
{ :statsd_package_name => 'gnocchi-statsd',
:statsd_service_name => 'gnocchi-statsd' }
end
it_behaves_like 'gnocchi-statsd'
end