openstack/devstack
Code Issues Proposed changes

Merge "Placement service only using default HTTPd ports"

Browse Source
This commit is contained in:
Jenkins 2016-12-22 10:08:53 +00:00 committed by Gerrit Code Review
commit be7fae041f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/apache-placement-api.template
View File

@ -1,6 +1,8 @@
Listen %PUBLICPORT% # NOTE(sbauza): This virtualhost is only here because some directives can
# only be set by a virtualhost or server context, so that's why the port is not bound.
<VirtualHost *:%PUBLICPORT%> # TODO(sbauza): Find a better way to identify a free port that is not corresponding to an existing
# vhost.
<VirtualHost *:8780>
WSGIDaemonProcess placement-api processes=%APIWORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% WSGIDaemonProcess placement-api processes=%APIWORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
WSGIProcessGroup placement-api WSGIProcessGroup placement-api
WSGIScriptAlias / %PUBLICWSGI% WSGIScriptAlias / %PUBLICWSGI%

7
lib/placement
View File

@ -47,7 +47,6 @@ fi
# Public facing bits # Public facing bits
PLACEMENT_SERVICE_PROTOCOL=${PLACEMENT_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} PLACEMENT_SERVICE_PROTOCOL=${PLACEMENT_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
PLACEMENT_SERVICE_HOST=${PLACEMENT_SERVICE_HOST:-$SERVICE_HOST} PLACEMENT_SERVICE_HOST=${PLACEMENT_SERVICE_HOST:-$SERVICE_HOST}
PLACEMENT_SERVICE_PORT=${PLACEMENT_SERVICE_PORT:-8778}
# Functions # Functions
# --------- # ---------
@ -68,7 +67,6 @@ function cleanup_placement {
# _config_placement_apache_wsgi() - Set WSGI config files # _config_placement_apache_wsgi() - Set WSGI config files
function _config_placement_apache_wsgi { function _config_placement_apache_wsgi {
local placement_api_apache_conf local placement_api_apache_conf
local placement_api_port=$PLACEMENT_SERVICE_PORT
local venv_path="" local venv_path=""
local nova_bin_dir="" local nova_bin_dir=""
nova_bin_dir=$(get_python_exec_prefix) nova_bin_dir=$(get_python_exec_prefix)
@ -89,7 +87,6 @@ function _config_placement_apache_wsgi {
sudo cp $FILES/apache-placement-api.template $placement_api_apache_conf sudo cp $FILES/apache-placement-api.template $placement_api_apache_conf
sudo sed -e " sudo sed -e "
s|%PUBLICPORT%|$placement_api_port|g;
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%PUBLICWSGI%|$nova_bin_dir/nova-placement-api|g; s|%PUBLICWSGI%|$nova_bin_dir/nova-placement-api|g;
s|%SSLENGINE%|$placement_ssl|g; s|%SSLENGINE%|$placement_ssl|g;
@ -161,10 +158,6 @@ function install_placement {
# start_placement_api() - Start the API processes ahead of other things # start_placement_api() - Start the API processes ahead of other things
function start_placement_api { function start_placement_api {
# Get right service port for testing
local service_port=$PLACEMENT_SERVICE_PORT
local placement_api_port=$PLACEMENT_SERVICE_PORT
enable_apache_site placement-api enable_apache_site placement-api
restart_apache_server restart_apache_server
tail_log placement-api /var/log/$APACHE_NAME/placement-api.log tail_log placement-api /var/log/$APACHE_NAME/placement-api.log