openstack/ironic
Code Issues Proposed changes

Merge "Devstack: Fix iPXE apache log location bug"

Browse Source
This commit is contained in:
Zuul
2019-09-21 18:24:58 +00:00
committed by Gerrit Code Review
parent 9762fba094 c9349c194a
commit bd835b671b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/files/apache-ipxe-ironic.template
View File

@@ -9,8 +9,8 @@ Listen %PUBLICPORT%
Allow from all Allow from all
Require all granted Require all granted
</Directory> </Directory>
ErrorLog /var/log/apache2/ipxe_error.log ErrorLog %APACHELOGDIR%/ipxe_error.log
ErrorLogFormat "%{cu}t [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] [frontend\ %A] %M% ,\ referer\ %{Referer}i" ErrorLogFormat "%{cu}t [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] [frontend\ %A] %M% ,\ referer\ %{Referer}i"
LogLevel info LogLevel info
CustomLog /var/log/apache2/ipxe_access.log "%{%Y-%m-%d}t %{%T}t.%{msec_frac}t [%l] %a \"%r\" %>s %b" CustomLog %APACHELOGDIR%/ipxe_access.log "%{%Y-%m-%d}t %{%T}t.%{msec_frac}t [%l] %a \"%r\" %>s %b"
</VirtualHost> </VirtualHost>

1
devstack/lib/ironic
View File

@@ -1079,6 +1079,7 @@ function _config_ironic_apache_ipxe {
sudo sed -e " sudo sed -e "
s|%PUBLICPORT%|$IRONIC_HTTP_PORT|g; s|%PUBLICPORT%|$IRONIC_HTTP_PORT|g;
s|%HTTPROOT%|$IRONIC_HTTP_DIR|g; s|%HTTPROOT%|$IRONIC_HTTP_DIR|g;
s|%APACHELOGDIR%|$APACHE_LOG_DIR|g;
" -i $ipxe_apache_conf " -i $ipxe_apache_conf
enable_apache_site ipxe-ironic enable_apache_site ipxe-ironic
} }