summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrabi <ramishra@redhat.com>2017-01-11 17:04:45 +0530
committerrabi <ramishra@redhat.com>2017-01-15 11:53:25 +0530
commite943d0874c8e8b690accd1ac303df4e745e8ffca (patch)
tree3bbc2ef8d0e28f9b86d593133ff355ce510abcfb
parent35935459daa7043a3a49af5ed3a6b4ae805eb6e5 (diff)
Make number of workers configurable with apache
This also adds the CustomLog directive to separately log requests. Change-Id: I7939e1a46f97a00f626cf282c9cba48208d9edea Closes-Bug: #1656616
Notes
Notes (review): Code-Review+2: Ethan Lynn <xuanlangjian@gmail.com> Code-Review+2: Rico Lin <rico.lin.guanyu@gmail.com> Workflow+1: Rico Lin <rico.lin.guanyu@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 27 Jan 2017 12:16:17 +0000 Reviewed-on: https://review.openstack.org/418906 Project: openstack/heat Branch: refs/heads/master
-rw-r--r--devstack/files/apache-heat-api-cfn.template5
-rw-r--r--devstack/files/apache-heat-api-cloudwatch.template5
-rw-r--r--devstack/files/apache-heat-api.template5
-rw-r--r--devstack/lib/heat3
4 files changed, 12 insertions, 6 deletions
diff --git a/devstack/files/apache-heat-api-cfn.template b/devstack/files/apache-heat-api-cfn.template
index ab33c66..7cbca4a 100644
--- a/devstack/files/apache-heat-api-cfn.template
+++ b/devstack/files/apache-heat-api-cfn.template
@@ -1,7 +1,7 @@
1Listen %PUBLICPORT% 1Listen %PUBLICPORT%
2 2
3<VirtualHost *:%PUBLICPORT%> 3<VirtualHost *:%PUBLICPORT%>
4 WSGIDaemonProcess heat-api-cfn processes=2 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% 4 WSGIDaemonProcess heat-api-cfn processes=%API_WORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
5 WSGIProcessGroup heat-api-cfn 5 WSGIProcessGroup heat-api-cfn
6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cfn 6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cfn
7 WSGIApplicationGroup %{GLOBAL} 7 WSGIApplicationGroup %{GLOBAL}
@@ -10,7 +10,8 @@ Listen %PUBLICPORT%
10 <IfVersion >= 2.4> 10 <IfVersion >= 2.4>
11 ErrorLogFormat "%{cu}t %M" 11 ErrorLogFormat "%{cu}t %M"
12 </IfVersion> 12 </IfVersion>
13 ErrorLog /var/log/%APACHE_NAME%/heat-api-cfn.log 13 ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log
14 CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined
14 %SSLENGINE% 15 %SSLENGINE%
15 %SSLCERTFILE% 16 %SSLCERTFILE%
16 %SSLKEYFILE% 17 %SSLKEYFILE%
diff --git a/devstack/files/apache-heat-api-cloudwatch.template b/devstack/files/apache-heat-api-cloudwatch.template
index 06c91bb..c86d9ee 100644
--- a/devstack/files/apache-heat-api-cloudwatch.template
+++ b/devstack/files/apache-heat-api-cloudwatch.template
@@ -1,7 +1,7 @@
1Listen %PUBLICPORT% 1Listen %PUBLICPORT%
2 2
3<VirtualHost *:%PUBLICPORT%> 3<VirtualHost *:%PUBLICPORT%>
4 WSGIDaemonProcess heat-api-cloudwatch processes=2 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% 4 WSGIDaemonProcess heat-api-cloudwatch processes=%API_WORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
5 WSGIProcessGroup heat-api-cloudwatch 5 WSGIProcessGroup heat-api-cloudwatch
6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cloudwatch 6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cloudwatch
7 WSGIApplicationGroup %{GLOBAL} 7 WSGIApplicationGroup %{GLOBAL}
@@ -10,7 +10,8 @@ Listen %PUBLICPORT%
10 <IfVersion >= 2.4> 10 <IfVersion >= 2.4>
11 ErrorLogFormat "%{cu}t %M" 11 ErrorLogFormat "%{cu}t %M"
12 </IfVersion> 12 </IfVersion>
13 ErrorLog /var/log/%APACHE_NAME%/heat-api-cloudwatch.log 13 ErrorLog /var/log/%APACHE_NAME%/heat_api_cloudwatch.log
14 CustomLog /var/log/%APACHE_NAME%/heat_api_cloudwatch_access.log combined
14 %SSLENGINE% 15 %SSLENGINE%
15 %SSLCERTFILE% 16 %SSLCERTFILE%
16 %SSLKEYFILE% 17 %SSLKEYFILE%
diff --git a/devstack/files/apache-heat-api.template b/devstack/files/apache-heat-api.template
index 4924b39..01411be 100644
--- a/devstack/files/apache-heat-api.template
+++ b/devstack/files/apache-heat-api.template
@@ -1,7 +1,7 @@
1Listen %PUBLICPORT% 1Listen %PUBLICPORT%
2 2
3<VirtualHost *:%PUBLICPORT%> 3<VirtualHost *:%PUBLICPORT%>
4 WSGIDaemonProcess heat-api processes=3 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% 4 WSGIDaemonProcess heat-api processes=%API_WORKERS% threads=10 user=%USER% display-name=%{GROUP} %VIRTUALENV%
5 WSGIProcessGroup heat-api 5 WSGIProcessGroup heat-api
6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api 6 WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api
7 WSGIApplicationGroup %{GLOBAL} 7 WSGIApplicationGroup %{GLOBAL}
@@ -10,7 +10,8 @@ Listen %PUBLICPORT%
10 <IfVersion >= 2.4> 10 <IfVersion >= 2.4>
11 ErrorLogFormat "%{cu}t %M" 11 ErrorLogFormat "%{cu}t %M"
12 </IfVersion> 12 </IfVersion>
13 ErrorLog /var/log/%APACHE_NAME%/heat-api.log 13 ErrorLog /var/log/%APACHE_NAME%/heat_api.log
14 CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined
14 %SSLENGINE% 15 %SSLENGINE%
15 %SSLCERTFILE% 16 %SSLCERTFILE%
16 %SSLKEYFILE% 17 %SSLKEYFILE%
diff --git a/devstack/lib/heat b/devstack/lib/heat
index c3bd161..fb781c3 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -350,6 +350,7 @@ function _config_heat_apache_wsgi {
350 s|%PUBLICPORT%|$heat_api_port|g; 350 s|%PUBLICPORT%|$heat_api_port|g;
351 s|%APACHE_NAME%|$APACHE_NAME|g; 351 s|%APACHE_NAME%|$APACHE_NAME|g;
352 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; 352 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
353 s|%API_WORKERS%|$API_WORKERS|g;
353 s|%SSLENGINE%|$heat_ssl|g; 354 s|%SSLENGINE%|$heat_ssl|g;
354 s|%SSLCERTFILE%|$heat_certfile|g; 355 s|%SSLCERTFILE%|$heat_certfile|g;
355 s|%SSLKEYFILE%|$heat_keyfile|g; 356 s|%SSLKEYFILE%|$heat_keyfile|g;
@@ -362,6 +363,7 @@ function _config_heat_apache_wsgi {
362 s|%PUBLICPORT%|$heat_cfn_api_port|g; 363 s|%PUBLICPORT%|$heat_cfn_api_port|g;
363 s|%APACHE_NAME%|$APACHE_NAME|g; 364 s|%APACHE_NAME%|$APACHE_NAME|g;
364 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; 365 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
366 s|%API_WORKERS%|$API_WORKERS|g;
365 s|%SSLENGINE%|$heat_ssl|g; 367 s|%SSLENGINE%|$heat_ssl|g;
366 s|%SSLCERTFILE%|$heat_certfile|g; 368 s|%SSLCERTFILE%|$heat_certfile|g;
367 s|%SSLKEYFILE%|$heat_keyfile|g; 369 s|%SSLKEYFILE%|$heat_keyfile|g;
@@ -374,6 +376,7 @@ function _config_heat_apache_wsgi {
374 s|%PUBLICPORT%|$heat_cw_api_port|g; 376 s|%PUBLICPORT%|$heat_cw_api_port|g;
375 s|%APACHE_NAME%|$APACHE_NAME|g; 377 s|%APACHE_NAME%|$APACHE_NAME|g;
376 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; 378 s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
379 s|%API_WORKERS%|$API_WORKERS|g;
377 s|%SSLENGINE%|$heat_ssl|g; 380 s|%SSLENGINE%|$heat_ssl|g;
378 s|%SSLCERTFILE%|$heat_certfile|g; 381 s|%SSLCERTFILE%|$heat_certfile|g;
379 s|%SSLKEYFILE%|$heat_keyfile|g; 382 s|%SSLKEYFILE%|$heat_keyfile|g;