From dd8c23b596b66602596c97758579175f03c102fa Mon Sep 17 00:00:00 2001 From: Christoph Albers Date: Fri, 16 Dec 2016 09:35:17 +0100 Subject: [PATCH] Now using bind_service instead of node attributes Change-Id: Iae2f2fc10071e969be905e5eca9401de1fba1c28 --- recipes/api.rb | 4 ++-- recipes/gnocchi_configure.rb | 4 ++-- spec/spec_helper.rb | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes/api.rb b/recipes/api.rb index d5d265f..0861c3b 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -75,8 +75,8 @@ end web_app 'ceilometer-api' do template 'wsgi-template.conf.erb' deamon_process 'ceilometer-api' - server_host node['openstack']['telemetry']['conf']['api']['host'] - server_port node['openstack']['telemetry']['conf']['api']['port'] + server_host bind_service.host + server_port bind_service.port server_entry ceilometer_server_entry log_dir node['apache']['log_dir'] log_debug node['openstack']['telemetry']['debug'] diff --git a/recipes/gnocchi_configure.rb b/recipes/gnocchi_configure.rb index 7131a47..cb7b70b 100644 --- a/recipes/gnocchi_configure.rb +++ b/recipes/gnocchi_configure.rb @@ -134,8 +134,8 @@ end web_app 'gnocchi-api' do template 'wsgi-template.conf.erb' deamon_process 'gnocchi-api' - server_host node['openstack']['telemetry-metric']['conf']['api']['host'] - server_port node['openstack']['telemetry-metric']['conf']['api']['port'] + server_host bind_service.host + server_port bind_service.port server_entry gnocchi_server_entry log_dir node['apache']['log_dir'] log_debug node['openstack']['telemetry-metric']['debug'] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 92b1b38..20d4520 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -42,10 +42,6 @@ shared_context 'telemetry-stubs' do .with('user', 'admin') .and_return('admin-pass') 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/httpd -t') end