1. devstack
  2. Commit 13f655720d77149d908fcae7d0b7c6d377c972d5
Browse code

Small fixes for running Nova services under Apache2

Following fixed were done:
1. Cleanup fixed.
2. API_WORKERS config option was added to nova config templates.
3. Nova API screen tabs were named as nova-api and nova-ec2-api.

Change-Id: I68dc6fd6c8aeffcec7f9039afd63bd1599c65682

Marian Horban authored on 2015/06/11 03:34:22
Showing 3 changed files
files/apache-nova-api.template
History View file @ 13f6557
... ... 
@@ -1,7 +1,7 @@
1 1 
 Listen %PUBLICPORT%
2 2
3 3 
 <VirtualHost *:%PUBLICPORT%>
4 
-    WSGIDaemonProcess nova-api processes=5 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
4 
+    WSGIDaemonProcess nova-api processes=%APIWORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
5 5 
     WSGIProcessGroup nova-api
6 6 
     WSGIScriptAlias / %PUBLICWSGI%
7 7 
     WSGIApplicationGroup %{GLOBAL}
... ... 
@@ -13,4 +13,4 @@ Listen %PUBLICPORT%
13 13 
     %SSLENGINE%
14 14 
     %SSLCERTFILE%
15 15 
     %SSLKEYFILE%
16 
-</VirtualHost>
17 16 
\ No newline at end of file
17 
+</VirtualHost>
files/apache-nova-ec2-api.template
History View file @ 13f6557
... ... 
@@ -1,7 +1,7 @@
1 1 
 Listen %PUBLICPORT%
2 2
3 3 
 <VirtualHost *:%PUBLICPORT%>
4 
-    WSGIDaemonProcess nova-ec2-api processes=5 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
4 
+    WSGIDaemonProcess nova-ec2-api processes=%APIWORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
5 5 
     WSGIProcessGroup nova-ec2-api
6 6 
     WSGIScriptAlias / %PUBLICWSGI%
7 7 
     WSGIApplicationGroup %{GLOBAL}
... ... 
@@ -13,4 +13,4 @@ Listen %PUBLICPORT%
13 13 
     %SSLENGINE%
14 14 
     %SSLCERTFILE%
15 15 
     %SSLKEYFILE%
16 
-</VirtualHost>
17 16 
\ No newline at end of file
17 
+</VirtualHost>
lib/nova
History View file @ 13f6557
... ... 
@@ -232,6 +232,10 @@ function cleanup_nova {
232 232 
     #if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then
233 233 
     #    cleanup_nova_hypervisor
234 234 
     #fi
235 
+
236 
+    if [ "$NOVA_USE_MOD_WSGI" == "True" ]; then
237 
+        _cleanup_nova_apache_wsgi
238 
+    fi
235 239 
 }
236 240
237 241 
 # _cleanup_nova_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file
... ... 
@@ -277,6 +281,7 @@ function _config_nova_apache_wsgi {
277 277 
         s|%SSLKEYFILE%|$nova_keyfile|g;
278 278 
         s|%USER%|$STACK_USER|g;
279 279 
         s|%VIRTUALENV%|$venv_path|g
280 
+        s|%APIWORKERS%|$API_WORKERS|g
280 281 
     " -i $nova_apache_conf
281 282
282 283 
     sudo cp $FILES/apache-nova-ec2-api.template $nova_ec2_apache_conf
... ... 
@@ -289,6 +294,7 @@ function _config_nova_apache_wsgi {
289 289 
         s|%SSLKEYFILE%|$nova_keyfile|g;
290 290 
         s|%USER%|$STACK_USER|g;
291 291 
         s|%VIRTUALENV%|$venv_path|g
292 
+        s|%APIWORKERS%|$API_WORKERS|g
292 293 
     " -i $nova_ec2_apache_conf
293 294 
 }
294 295
... ... 
@@ -761,8 +767,8 @@ function start_nova_api {
761 761 
         enable_apache_site nova-api
762 762 
         enable_apache_site nova-ec2-api
763 763 
         restart_apache_server
764 
-        tail_log nova /var/log/$APACHE_NAME/nova-api.log
765 
-        tail_log nova /var/log/$APACHE_NAME/nova-ec2-api.log
764 
+        tail_log nova-api /var/log/$APACHE_NAME/nova-api.log
765 
+        tail_log nova-ec2-api /var/log/$APACHE_NAME/nova-ec2-api.log
766 766 
     else
767 767 
         run_process n-api "$NOVA_BIN_DIR/nova-api"
768 768 
     fi