From de689f411b5091112404629d88987f673d4a465d Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Tue, 9 Jul 2013 12:44:14 -0400 Subject: [PATCH] Add templates for glance-registry-paste.ini as they differ in essex, folsom, and grizzly. Havana uses the grizzly one --- .../{ => essex}/glance-registry-paste.ini | 0 templates/folsom/glance-registry-paste.ini | 28 +++++++++++++++++ templates/grizzly/glance-registry-paste.ini | 30 +++++++++++++++++++ 3 files changed, 58 insertions(+) rename templates/{ => essex}/glance-registry-paste.ini (100%) create mode 100644 templates/folsom/glance-registry-paste.ini create mode 100644 templates/grizzly/glance-registry-paste.ini diff --git a/templates/glance-registry-paste.ini b/templates/essex/glance-registry-paste.ini similarity index 100% rename from templates/glance-registry-paste.ini rename to templates/essex/glance-registry-paste.ini diff --git a/templates/folsom/glance-registry-paste.ini b/templates/folsom/glance-registry-paste.ini new file mode 100644 index 00000000..cc63bc10 --- /dev/null +++ b/templates/folsom/glance-registry-paste.ini @@ -0,0 +1,28 @@ +[pipeline:glance-registry] +pipeline = unauthenticated-context registryapp + +[pipeline:glance-registry-keystone] +pipeline = authtoken context registryapp + +[app:registryapp] +paste.app_factory = glance.registry.api.v1:API.factory + +[filter:context] +paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory + +[filter:unauthenticated-context] +paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory + +[filter:authtoken] +paste.filter_factory = keystone.middleware.auth_token:filter_factory +service_protocol = {{ service_protocol }} +service_host = {{ service_host }} +service_port = {{ service_port }} +auth_host = {{ auth_host }} +auth_port = {{ auth_port }} +auth_protocol = {{ auth_protocol }} +auth_uri = http://{{ service_host }}:{{ service_port }}/ +admin_tenant_name = {{ admin_tenant_name }} +admin_user = {{ admin_user }} +admin_password = {{ admin_password }} +admin_token = {{ admin_token }} diff --git a/templates/grizzly/glance-registry-paste.ini b/templates/grizzly/glance-registry-paste.ini new file mode 100644 index 00000000..e2edce11 --- /dev/null +++ b/templates/grizzly/glance-registry-paste.ini @@ -0,0 +1,30 @@ +# Use this pipeline for no auth - DEFAULT +[pipeline:glance-registry] +pipeline = unauthenticated-context registryapp + +# Use this pipeline for keystone auth +[pipeline:glance-registry-keystone] +pipeline = authtoken context registryapp + +[app:registryapp] +paste.app_factory = glance.registry.api.v1:API.factory + +[filter:context] +paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory + +[filter:unauthenticated-context] +paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory + +[filter:authtoken] +paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory +service_protocol = {{ service_protocol }} +service_host = {{ service_host }} +service_port = {{ service_port }} +auth_host = {{ auth_host }} +auth_port = {{ auth_port }} +auth_protocol = {{ auth_protocol }} +auth_uri = http://{{ service_host }}:{{ service_port }}/ +admin_tenant_name = {{ admin_tenant_name }} +admin_user = {{ admin_user }} +admin_password = {{ admin_password }} +admin_token = {{ admin_token }}