From 128e66eb4ba316af2664d6e13f957245c58279ba Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Mon, 6 Mar 2017 16:05:42 -0800 Subject: [PATCH] Corrects Ceilometer installation, fixes typo - corrects deamon_process to daemon_process - removes duplicate Listen directive in wsgi-template.conf.erb that gets emitted in ports.conf that the apache2 cookbook lays down - adds a run directory for ceilometer api socket Change-Id: Ia369a50e42453428b0c572659b0c4078920e9890 --- recipes/api.rb | 3 ++- recipes/common.rb | 7 +++++++ recipes/gnocchi_configure.rb | 3 ++- templates/wsgi-template.conf.erb | 12 +++++------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/recipes/api.rb b/recipes/api.rb index 749c299..4985acc 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -80,10 +80,11 @@ end web_app 'ceilometer-api' do template 'wsgi-template.conf.erb' - deamon_process 'ceilometer-api' + daemon_process 'ceilometer-api' server_host bind_service.host server_port bind_service.port server_entry ceilometer_server_entry + run_dir node['apache']['run_dir'] log_dir node['apache']['log_dir'] log_debug node['openstack']['telemetry']['debug'] user node['openstack']['telemetry']['user'] diff --git a/recipes/common.rb b/recipes/common.rb index 78f252b..b64802d 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -86,6 +86,13 @@ directory node['openstack']['telemetry']['conf_dir'] do action :create end +directory "#{node['apache']['run_dir']}/ceilometer" do + owner node['openstack']['telemetry']['user'] + group node['openstack']['telemetry']['group'] + mode 00750 + action :create +end + # merge all config options and secrets to be used in the ceilometer.conf ceilometer_conf_options = merge_config_options 'telemetry' diff --git a/recipes/gnocchi_configure.rb b/recipes/gnocchi_configure.rb index 0089589..821ffaa 100644 --- a/recipes/gnocchi_configure.rb +++ b/recipes/gnocchi_configure.rb @@ -134,10 +134,11 @@ end web_app 'gnocchi-api' do template 'wsgi-template.conf.erb' - deamon_process 'gnocchi-api' + daemon_process 'gnocchi-api' server_host bind_service.host server_port bind_service.port server_entry gnocchi_server_entry + run_dir node['apache']['run_dir'] log_dir node['apache']['log_dir'] log_debug node['openstack']['telemetry-metric']['debug'] user node['openstack']['telemetry-metric']['user'] diff --git a/templates/wsgi-template.conf.erb b/templates/wsgi-template.conf.erb index 19a96d5..4623b3a 100644 --- a/templates/wsgi-template.conf.erb +++ b/templates/wsgi-template.conf.erb @@ -1,17 +1,15 @@ <%= node["openstack"]["telemetry"]["custom_template_banner"] %> -Listen <%= @params[:server_host] %>:<%= @params[:server_port] %> - :<%= @params[:server_port] %>> - WSGIDaemonProcess <%= @params[:deamon_process] %> processes=2 threads=10 user=<%= @params[:user] %> group=<%= @params[:group] %> display-name=%{GROUP} - WSGIProcessGroup <%= @params[:deamon_process] %> + WSGIDaemonProcess <%= @params[:daemon_process] %> processes=2 threads=10 user=<%= @params[:user] %> group=<%= @params[:group] %> display-name=%{GROUP} + WSGIProcessGroup <%= @params[:daemon_process] %> WSGIScriptAlias / <%= @params[:server_entry] %> WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On ErrorLogFormat "%{cu}t %M" - ErrorLog <%= @params[:log_dir] %>/<%= @params[:deamon_process] %>_error.log - CustomLog <%= @params[:log_dir] %>/<%= @params[:deamon_process] %>_access.log combined + ErrorLog <%= @params[:log_dir] %>/<%= @params[:daemon_process] %>_error.log + CustomLog <%= @params[:log_dir] %>/<%= @params[:daemon_process] %>_access.log combined <% if [true, 'true', 'True'].include?(@params[:log_debug]) -%> LogLevel debug <% end -%> @@ -34,4 +32,4 @@ Listen <%= @params[:server_host] %>:<%= @params[:server_port] %> <% end -%> -WSGISocketPrefix /var/run/apache2 \ No newline at end of file +WSGISocketPrefix <%= @params[:run_dir] %>