openstack/devstack
Code Issues Proposed changes

Merge "Added processing /ec2 URL"

Browse Source
This commit is contained in:
Jenkins 2015-10-29 02:16:50 +00:00 committed by Gerrit Code Review
commit 5c38750db0
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/apache-nova-ec2-api.template
View File

@ -14,3 +14,12 @@ Listen %PUBLICPORT%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%
</VirtualHost> </VirtualHost>
Alias /ec2 %PUBLICWSGI%
<Location /ec2>
SetHandler wsgi-script
Options +ExecCGI
WSGIProcessGroup nova-ec2-api
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
</Location>

13
lib/nova
View File

@ -444,13 +444,18 @@ function create_nova_accounts {
# EC2 # EC2
if [[ "$KEYSTONE_CATALOG_BACKEND" = "sql" ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = "sql" ]]; then
local nova_ec2_api_url
if [[ "$NOVA_USE_MOD_WSGI" == "False" ]]; then
nova_ec2_api_url="$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:$EC2_SERVICE_PORT/"
else
nova_ec2_api_url="$EC2_SERVICE_PROTOCOL://$SERVICE_HOST/ec2"
fi
get_or_create_service "ec2" "ec2" "EC2 Compatibility Layer" get_or_create_service "ec2" "ec2" "EC2 Compatibility Layer"
get_or_create_endpoint "ec2" \ get_or_create_endpoint "ec2" \
"$REGION_NAME" \ "$REGION_NAME" \
"$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \ "$nova_ec2_api_url" \
"$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \ "$nova_ec2_api_url" \
"$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" "$nova_ec2_api_url"
fi fi
fi fi