1. devstack
  2. Commit 0ea8b72a20be9026f025eaa6d9b4277b058aa735
Browse code

Make EC2 compatible with current AWS CLI.

Nova listens for EC2 calls now at the URL without path -
http://some.server.com:8773/
I was made in review -
https://review.openstack.org/#/c/152496/

So I suggest to change EC2 urls in keystone catalog.

Change-Id: Ia2975ce0f6a30eed6016733e12c98b5f97648307
Closes-Bug: 1417555

Andrey Pavlov authored on 2015/02/07 04:37:53
Showing 4 changed files
files/default_catalog.templates
History View file @ 0ea8b72
... ... 
@@ -30,9 +30,9 @@ catalog.RegionOne.volumev2.internalURL = http://%SERVICE_HOST%:8776/v2/$(tenant_
30 30 
 catalog.RegionOne.volumev2.name = Volume Service V2
31 31
32 32
33 
-catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud
34 
-catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin
35 
-catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
33 
+catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/
34 
+catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/
35 
+catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/
36 36 
 catalog.RegionOne.ec2.name = EC2 Service
37 37
38 38
lib/nova
History View file @ 0ea8b72
... ... 
@@ -397,9 +397,9 @@ function create_nova_accounts {
397 397 
                 "ec2" "EC2 Compatibility Layer")
398 398 
             get_or_create_endpoint $ec2_service \
399 399 
                 "$REGION_NAME" \
400 
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Cloud" \
401 
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Admin" \
402 
-                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Cloud"
400 
+                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \
401 
+                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/" \
402 
+                "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/"
403 403 
         fi
404 404 
     fi
405 405
lib/tempest
History View file @ 0ea8b72
... ... 
@@ -359,7 +359,7 @@ function configure_tempest {
359 359 
     iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions
360 360
361 361 
     # boto
362 
-    iniset $TEMPEST_CONFIG boto ec2_url "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/services/Cloud"
362 
+    iniset $TEMPEST_CONFIG boto ec2_url "$EC2_SERVICE_PROTOCOL://$SERVICE_HOST:8773/"
363 363 
     iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"
364 364 
     iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"
365 365 
     iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd.manifest.xml
tools/create_userrc.sh
History View file @ 0ea8b72
... ... 
@@ -131,7 +131,7 @@ export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT
131 131
132 132 
 EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true)
133 133 
 if [[ -z $EC2_URL ]]; then
134 
-    EC2_URL=http://localhost:8773/services/Cloud
134 
+    EC2_URL=http://localhost:8773/
135 135 
 fi
136 136
137 137 
 S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true)