openstack/ironic
Code Issues Proposed changes

Merge "Use the apache-ironic.template from our tree"

Browse Source
This commit is contained in:
Jenkins 2015-12-24 08:54:47 +00:00 committed by Gerrit Code Review
commit 503284a81c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@ -232,7 +232,7 @@ function _cleanup_ironic_apache_wsgi {
function _config_ironic_apache_wsgi { function _config_ironic_apache_wsgi {
local ironic_apache_conf local ironic_apache_conf
ironic_apache_conf=$(apache_site_config_for ironic) ironic_apache_conf=$(apache_site_config_for ironic)
sudo cp $FILES/apache-ironic.template $ironic_apache_conf sudo cp $IRONIC_DEVSTACK_FILES_DIR/apache-ironic.template $ironic_apache_conf
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;