commit 085855479f5a56e9ce21fdb83e2691c8aad56aa0
author Marian Horban <mhorban@mirantis.com> Mon Oct 12 11:36:51 2015 -0400
committer Marian Horban <mhorban@mirantis.com> Tue Oct 13 04:04:21 2015 -0400
tree 53047a851440719436ad385eb5f7381547c30dde
parent 0914d04343b60392c5227559dcaa0da39b2d1c64

Added processing /ec2 URL

With config option NOVA_USE_MOD_WSGI=True nova-ec2-api handles
requests on /ec2 URL.

Change-Id: I0c2e99bf8b5e5cf53cd176685b206038a4b0f78b

lib/nova

diff --git a/lib/nova b/lib/nova
index 9830276..eb1ae1c 100644
--- a/lib/nova
+++ b/lib/nova
@@ -440,13 +440,18 @@
 
         # EC2
         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_endpoint "ec2" \
                 "$REGION_NAME" \
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/"
+                "$nova_ec2_api_url" \
+                "$nova_ec2_api_url" \
+                "$nova_ec2_api_url"
         fi
     fi