Use the apache-ironic.template from our tree

There's an apache-ironic.template in the Ironic tree and in the Devstack
tree, prior to this patch only the one in Devstack was being used.

Closes-Bug: #1527222
Change-Id: I2808001356542adb306a7b7ad5dd84d0d7167ab6
This commit is contained in:
Lucas Alvares Gomes 2015-12-16 17:05:56 +00:00
parent 2a5f6ded69
commit 3bd1ecbcc7

View File

@ -229,7 +229,7 @@ function _cleanup_ironic_apache_wsgi {
function _config_ironic_apache_wsgi {
local ironic_apache_conf
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 "
s|%PUBLICPORT%|$IRONIC_HTTP_PORT|g;
s|%HTTPROOT%|$IRONIC_HTTP_DIR|g;