Merge "Make EC2 compatible with current AWS CLI."

etc/nova/api-paste.ini

@@ -17,7 +17,7 @@ paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
 
 [composite:ec2]
 use = egg:Paste#urlmap
-/services/Cloud: ec2cloud
+/: ec2cloud
 
 [composite:ec2cloud]
 use = call:nova.api.auth:pipeline_factory

nova/api/ec2/cloud.py

@@ -66,7 +66,7 @@ ec2_opts = [
                help='The protocol to use when connecting to the EC2 API '
                     'server (http, https)'),
     cfg.StrOpt('ec2_path',
-               default='/services/Cloud',
+               default='/',
                help='The path prefix used to call the ec2 API server'),
     cfg.ListOpt('region_list',
                 default=[],