From 01ecebcecdfa79889dee478eedea1ab48a9e3ca6 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Mon, 15 Jul 2013 15:40:18 +0300 Subject: python-nova: Load credentials from the identity class Signed-off-by: Mihai Prica --- .../python/python-nova/api-paste.ini | 109 --------------------- .../recipes-devtools/python/python-nova_2013.1.bb | 16 +-- 2 files changed, 10 insertions(+), 115 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-nova/api-paste.ini (limited to 'meta-openstack/recipes-devtools') diff --git a/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini b/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini deleted file mode 100644 index 58ffbb0..0000000 --- a/meta-openstack/recipes-devtools/python/python-nova/api-paste.ini +++ /dev/null @@ -1,109 +0,0 @@ -############ -# Metadata # -############ -[composite:metadata] -use = egg:Paste#urlmap -/: meta - -[pipeline:meta] -pipeline = ec2faultwrap logrequest metaapp - -[app:metaapp] -paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory - -####### -# EC2 # -####### - -[composite:ec2] -use = egg:Paste#urlmap -/services/Cloud: ec2cloud - -[composite:ec2cloud] -use = call:nova.api.auth:pipeline_factory -noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor -keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor - -[filter:ec2faultwrap] -paste.filter_factory = nova.api.ec2:FaultWrapper.factory - -[filter:logrequest] -paste.filter_factory = nova.api.ec2:RequestLogging.factory - -[filter:ec2lockout] -paste.filter_factory = nova.api.ec2:Lockout.factory - -[filter:ec2keystoneauth] -paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.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: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 - -############# -# Openstack # -############# - -[composite:osapi_compute] -use = call:nova.api.openstack.urlmap:urlmap_factory -/: oscomputeversions -/v1.1: openstack_compute_api_v2 -/v2: openstack_compute_api_v2 - -[composite:openstack_compute_api_v2] -use = call:nova.api.auth:pipeline_factory -noauth = faultwrap sizelimit noauth ratelimit osapi_compute_app_v2 -keystone = faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2 -keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2 - -[filter:faultwrap] -paste.filter_factory = nova.api.openstack:FaultWrapper.factory - -[filter:noauth] -paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory - -[filter:ratelimit] -paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory - -[filter:sizelimit] -paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory - -[app:osapi_compute_app_v2] -paste.app_factory = nova.api.openstack.compute:APIRouter.factory - -[pipeline:oscomputeversions] -pipeline = faultwrap oscomputeversionapp - -[app:oscomputeversionapp] -paste.app_factory = nova.api.openstack.compute.versions:Versions.factory - -########## -# Shared # -########## - -[filter:keystonecontext] -paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory - -[filter:authtoken] -paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http -admin_tenant_name = service -admin_user = nova -admin_password = password -signing_dir = /tmp/keystone-signing-nova -# Workaround for https://bugs.launchpad.net/nova/+bug/1154809 -auth_version = v2.0 diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb index 0c59c2d..5a3750a 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.bb @@ -13,18 +13,17 @@ SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-$ file://nova.conf \ file://nova-compute \ file://nova-all \ - file://api-paste.ini" - + " SRC_URI[md5sum] = "38022353c398ce38c4e220d1d18b5916" SRC_URI[sha256sum] = "db7f5259d848358bf14105d5833869ec145f643312e6bc0adef0050120fe3e07" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit setuptools useradd update-rc.d +inherit setuptools useradd update-rc.d identity do_install_append() { - + TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} NOVA_CONF_DIR=${D}/${sysconfdir}/nova install -d ${NOVA_CONF_DIR} @@ -48,6 +47,13 @@ do_install_append() { chown root:root ${D}${sysconfdir}/sudoers.d/nova-rootwrap echo "root ALL=(root) NOPASSWD: ${bindir}/nova-rootwrap" > ${D}${sysconfdir}/sudoers.d/nova-rootwrap + #Configuration options + sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \ + ${TEMPLATE_CONF_DIR}/api-paste.ini > ${WORKDIR}/api-paste.ini + sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/api-paste.ini + sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \ + -i ${WORKDIR}/api-paste.ini + #Copy the configuration file install -m 664 ${WORKDIR}/nova.conf ${NOVA_CONF_DIR}/nova.conf install -m 664 ${WORKDIR}/api-paste.ini ${NOVA_CONF_DIR} @@ -64,8 +70,6 @@ do_install_append() { } -inherit useradd update-rc.d - USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system nova" USERADD_PARAM_${PN} = "--system --home /var/lib/nova -g nova \ -- cgit v1.2.3-54-g00ecf