ceilometer-api and gnocchi-api need to be disabled on Ubuntu
Change-Id: I76622053bd792c70b84f1cf358e7ab118ef23390
This commit is contained in:
parent
dd8c23b596
commit
fa541f72fd
|
@ -36,6 +36,12 @@ platform['api_packages'].each do |pkg|
|
|||
action :upgrade
|
||||
end
|
||||
end
|
||||
# stop and disable the service ceilometer-api itself, since it should be run inside
|
||||
# of apache
|
||||
service platform['api_service'] do
|
||||
action [:stop, :disable]
|
||||
end
|
||||
|
||||
bind_service = node['openstack']['bind_service']['all']['telemetry']
|
||||
bind_service_address = bind_address bind_service
|
||||
#### Start of Apache specific work
|
||||
|
|
|
@ -25,3 +25,8 @@ platform['gnocchi_packages'].each do |pkg|
|
|||
version '2.0.2-4'
|
||||
end
|
||||
end
|
||||
# stop and disable the service gnocchi-api_service itself, since it should be run inside
|
||||
# of apache
|
||||
service platform['gnocchi-api_service'] do
|
||||
action [:stop, :disable]
|
||||
end
|
||||
|
|
|
@ -13,6 +13,10 @@ describe 'openstack-telemetry::api' do
|
|||
it 'installs the api package' do
|
||||
expect(chef_run).to upgrade_package 'ceilometer-api'
|
||||
end
|
||||
it do
|
||||
expect(chef_run).to stop_service('ceilometer-api')
|
||||
expect(chef_run).to disable_service('ceilometer-api')
|
||||
end
|
||||
|
||||
describe 'apache recipes' do
|
||||
it 'include apache recipes' do
|
||||
|
|
|
@ -14,6 +14,11 @@ describe 'openstack-telemetry::gnocchi_install' do
|
|||
expect(chef_run).to install_package 'gnocchi-api'
|
||||
end
|
||||
|
||||
it do
|
||||
expect(chef_run).to stop_service('gnocchi-api')
|
||||
expect(chef_run).to disable_service('gnocchi-api')
|
||||
end
|
||||
|
||||
it do
|
||||
expect(chef_run).to install_package 'gnocchi-metricd'
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue