Now using bind_service instead of node attributes
Change-Id: Iae2f2fc10071e969be905e5eca9401de1fba1c28
This commit is contained in:
parent
b33c0ca574
commit
dd8c23b596
|
@ -75,8 +75,8 @@ end
|
||||||
web_app 'ceilometer-api' do
|
web_app 'ceilometer-api' do
|
||||||
template 'wsgi-template.conf.erb'
|
template 'wsgi-template.conf.erb'
|
||||||
deamon_process 'ceilometer-api'
|
deamon_process 'ceilometer-api'
|
||||||
server_host node['openstack']['telemetry']['conf']['api']['host']
|
server_host bind_service.host
|
||||||
server_port node['openstack']['telemetry']['conf']['api']['port']
|
server_port bind_service.port
|
||||||
server_entry ceilometer_server_entry
|
server_entry ceilometer_server_entry
|
||||||
log_dir node['apache']['log_dir']
|
log_dir node['apache']['log_dir']
|
||||||
log_debug node['openstack']['telemetry']['debug']
|
log_debug node['openstack']['telemetry']['debug']
|
||||||
|
|
|
@ -134,8 +134,8 @@ end
|
||||||
web_app 'gnocchi-api' do
|
web_app 'gnocchi-api' do
|
||||||
template 'wsgi-template.conf.erb'
|
template 'wsgi-template.conf.erb'
|
||||||
deamon_process 'gnocchi-api'
|
deamon_process 'gnocchi-api'
|
||||||
server_host node['openstack']['telemetry-metric']['conf']['api']['host']
|
server_host bind_service.host
|
||||||
server_port node['openstack']['telemetry-metric']['conf']['api']['port']
|
server_port bind_service.port
|
||||||
server_entry gnocchi_server_entry
|
server_entry gnocchi_server_entry
|
||||||
log_dir node['apache']['log_dir']
|
log_dir node['apache']['log_dir']
|
||||||
log_debug node['openstack']['telemetry-metric']['debug']
|
log_debug node['openstack']['telemetry-metric']['debug']
|
||||||
|
|
|
@ -42,10 +42,6 @@ shared_context 'telemetry-stubs' do
|
||||||
.with('user', 'admin')
|
.with('user', 'admin')
|
||||||
.and_return('admin-pass')
|
.and_return('admin-pass')
|
||||||
allow(Chef::Application).to receive(:fatal!)
|
allow(Chef::Application).to receive(:fatal!)
|
||||||
node.set['openstack']['telemetry']['conf']['api']['host'] = '127.0.0.1'
|
|
||||||
node.set['openstack']['telemetry']['conf']['api']['port'] = '8777'
|
|
||||||
node.set['openstack']['telemetry-metric']['conf']['api']['host'] = '127.0.0.1'
|
|
||||||
node.set['openstack']['telemetry-metric']['conf']['api']['port'] = '8041'
|
|
||||||
stub_command('/usr/sbin/apache2 -t')
|
stub_command('/usr/sbin/apache2 -t')
|
||||||
stub_command('/usr/sbin/httpd -t')
|
stub_command('/usr/sbin/httpd -t')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue