From cf68c09363f051495cf2fcdf5a56c5be3612970e Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: 2015年4月16日 10:25:01 -0500 Subject: [PATCH] Updated nova to allow for v3 and ec2 to be enabled The paste.ini has been rebased on upstream master and a conditional was added to the nova.conf file. This change makes it possible for a deployer to consume the deprecated apis for EC2 and NovaV3. While The endpoints will not be "automatically" created the paste config has been rebased to support the apis if needed. Partially implements: blueprint master-kilofication Change-Id: I061d743b569ebc0753a47d183545ed185bad854e --- files/api-paste.ini | 80 ++++++++++++++++++++---------------------- templates/nova.conf.j2 | 2 +- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/files/api-paste.ini b/files/api-paste.ini index 6405abee..1a87f0c5 100644 --- a/files/api-paste.ini +++ b/files/api-paste.ini @@ -6,8 +6,7 @@ use = egg:Paste#urlmap /: meta [pipeline:meta] -pipeline = metaapp -# pipeline = ec2faultwrap logrequest metaapp +pipeline = ec2faultwrap logrequest metaapp [app:metaapp] paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory @@ -16,44 +15,43 @@ paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory # EC2 # ####### -# [composite:ec2] -# use = egg:Paste#urlmap -# /: ec2cloud +[composite:ec2] +use = egg:Paste#urlmap +/: ec2cloud -# [composite:ec2cloud] -# use = call:nova.api.auth:pipeline_factory -# noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor -# noauth2 = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor -# keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor +[composite:ec2cloud] +use = call:nova.api.auth:pipeline_factory +noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor +noauth2 = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor +keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor -# [filter:ec2faultwrap] -# paste.filter_factory = nova.api.ec2:FaultWrapper.factory +[filter:ec2faultwrap] +paste.filter_factory = nova.api.ec2:FaultWrapper.factory -# [filter:logrequest] -# paste.filter_factory = nova.api.ec2:RequestLogging.factory +[filter:logrequest] +paste.filter_factory = nova.api.ec2:RequestLogging.factory -# [filter:ec2lockout] -# paste.filter_factory = nova.api.ec2:Lockout.factory +[filter:ec2lockout] +paste.filter_factory = nova.api.ec2:Lockout.factory -# [filter:ec2keystoneauth] -# paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory +[filter:ec2keystoneauth] +paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory -# [filter:ec2noauth] -# paste.filter_factory = nova.api.ec2:NoAuth.factory +[filter:ec2noauth] +paste.filter_factory = nova.api.ec2:NoAuth.factory -# [filter:cloudrequest] -# controller = nova.api.ec2.cloud.CloudController -# paste.filter_factory = nova.api.ec2:Requestify.factory +[filter:cloudrequest] +controller = nova.api.ec2.cloud.CloudController +paste.filter_factory = nova.api.ec2:Requestify.factory -# [filter:authorizer] -# paste.filter_factory = nova.api.ec2:Authorizer.factory +[filter:authorizer] +paste.filter_factory = nova.api.ec2:Authorizer.factory -# [filter:validator] -# paste.filter_factory = nova.api.ec2:Validator.factory - -# [app:ec2executor] -# paste.app_factory = nova.api.ec2:Executor.factory +[filter:validator] +paste.filter_factory = nova.api.ec2:Validator.factory +[app:ec2executor] +paste.app_factory = nova.api.ec2:Executor.factory ############# # OpenStack # @@ -62,10 +60,10 @@ paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory [composite:osapi_compute] use = call:nova.api.openstack.urlmap:urlmap_factory /: oscomputeversions -#/v1.1: openstack_compute_api_v2 +/v1.1: openstack_compute_api_v2 /v2: openstack_compute_api_v2 /v2.1: openstack_compute_api_v21 -#/v3: openstack_compute_api_v3 +/v3: openstack_compute_api_v3 [composite:openstack_compute_api_v2] use = call:nova.api.auth:pipeline_factory @@ -80,11 +78,11 @@ noauth = compute_req_id faultwrap sizelimit noauth osapi_compute_app_v21 noauth2 = compute_req_id faultwrap sizelimit noauth2 osapi_compute_app_v21 keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v21 -#[composite:openstack_compute_api_v3] -#use = call:nova.api.auth:pipeline_factory_v21 -#noauth = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3 -#noauth2 = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3 -#keystone = request_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3 +[composite:openstack_compute_api_v3] +use = call:nova.api.auth:pipeline_factory_v21 +noauth = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3 +noauth2 = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3 +keystone = request_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3 [filter:request_id] paste.filter_factory = oslo.middleware:RequestId.factory @@ -101,8 +99,8 @@ paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareOld.factory [filter:noauth2] paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory -#[filter:noauth_v3] -#paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory +[filter:noauth_v3] +paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory [filter:ratelimit] paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory @@ -116,8 +114,8 @@ paste.app_factory = nova.api.openstack.compute:APIRouter.factory [app:osapi_compute_app_v21] paste.app_factory = nova.api.openstack.compute:APIRouterV21.factory -#[app:osapi_compute_app_v3] -#paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory +[app:osapi_compute_app_v3] +paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory [pipeline:oscomputeversions] pipeline = faultwrap oscomputeversionapp diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index e676ac5f..773aaabb 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -142,7 +142,7 @@ workers = {{ nova_conductor_workers | default(api_threads) }} [osapi_v3] -enabled = False +enabled = {{ nova_v3_deprecated_but_enabled }} [keystone_authtoken]

AltStyle によって変換されたページ (->オリジナル) /