From 536eb28ea61ba6b8a4c0c6af81074a153baa802e Mon Sep 17 00:00:00 2001 From: rabi Date: Wed, 16 Nov 2016 10:14:54 +0530 Subject: [PATCH] Use apache config templates from local tree Now that the apache job is fixed, change the plugin to use apache config templates from local tree. Else, it would not work when the devstack tree code is removed. Change-Id: I9a8627ad85821001968948dd7798999c8db14023 --- devstack/lib/heat | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 83a7fa06d8..8841a18aeb 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -44,9 +44,7 @@ GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master} HEAT_USE_MOD_WSGI=${HEAT_USE_MOD_WSGI:-False} HEAT_DIR=$DEST/heat - -HEAT_PIP_REPO=$DATA_DIR/heat-pip-repo -HEAT_PIP_REPO_PORT=${HEAT_PIP_REPO_PORT:-8899} +HEAT_FILES_DIR=$HEAT_DIR/devstack/files HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat} HEAT_STANDALONE=$(trueorfalse False HEAT_STANDALONE) @@ -354,7 +352,7 @@ function _config_heat_apache_wsgi { local heat_cw_api_port=$HEAT_API_CW_PORT local venv_path="" - sudo cp $FILES/apache-heat-api.template $heat_apache_conf + sudo cp $HEAT_FILES_DIR/apache-heat-api.template $heat_apache_conf sudo sed -e " s|%PUBLICPORT%|$heat_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g; @@ -366,7 +364,7 @@ function _config_heat_apache_wsgi { s|%VIRTUALENV%|$venv_path|g " -i $heat_apache_conf - sudo cp $FILES/apache-heat-api-cfn.template $heat_cfn_apache_conf + sudo cp $HEAT_FILES_DIR/apache-heat-api-cfn.template $heat_cfn_apache_conf sudo sed -e " s|%PUBLICPORT%|$heat_cfn_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g; @@ -378,7 +376,7 @@ function _config_heat_apache_wsgi { s|%VIRTUALENV%|$venv_path|g " -i $heat_cfn_apache_conf - sudo cp $FILES/apache-heat-api-cloudwatch.template $heat_cloudwatch_apache_conf + sudo cp $HEAT_FILES_DIR/apache-heat-api-cloudwatch.template $heat_cloudwatch_apache_conf sudo sed -e " s|%PUBLICPORT%|$heat_cw_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g;