Skip to content
Browse files

Resync with devstack.sh v1, seems like confs were updated and horizon…

… no longer needs to link to the quantum client directory, yippe.

Issue #75
  • Loading branch information...
1 parent 4276fda commit cd724c3d6bacfa4f9cfb622950a255c235318e5e Joshua Harlow committed Mar 19, 2012
View
23 conf/templates/glance/glance-api-paste.ini
@@ -1,62 +1,45 @@
-# From devstack commit b3288381047690510845209cc372d07e5b11e396
+# From devstack commit 6aef757432595ec4aa318c20246bf1d6aaf681db
[pipeline:glance-api]
-
#pipeline = versionnegotiation context apiv1app
# NOTE: use the following pipeline for keystone
-pipeline = versionnegotiation authtoken auth-context apiv1app
+pipeline = versionnegotiation authtoken context apiv1app
# To enable Image Cache Management API replace pipeline with below:
# pipeline = versionnegotiation context imagecache apiv1app
# NOTE: use the following pipeline for keystone auth (with caching)
# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
[app:apiv1app]
-
paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.api.v1.router:API
[filter:versionnegotiation]
-
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
[filter:cache]
-
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.cache:CacheFilter
[filter:cachemanage]
-
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter
[filter:context]
-
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken]
-
paste.filter_factory = keystone.middleware.auth_token:filter_factory
-
+# FIXME(dtroyer): remove these service_* entries after auth_token is updated
service_host = %KEYSTONE_SERVICE_HOST%
service_port = %KEYSTONE_SERVICE_PORT%
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
-
auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
-
-admin_token = %SERVICE_TOKEN%
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USERNAME%
admin_password = %SERVICE_PASSWORD%
-
-[filter:auth-context]
-
-paste.filter_factory = glance.common.wsgi:filter_factory
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
-
-
View
22 conf/templates/glance/glance-registry-paste.ini
@@ -1,45 +1,29 @@
-# From devstack commit b3288381047690510845209cc372d07e5b11e396
+# From devstack commit 6aef757432595ec4aa318c20246bf1d6aaf681db
[pipeline:glance-registry]
-
#pipeline = context registryapp
# NOTE: use the following pipeline for keystone
-pipeline = authtoken auth-context context registryapp
+pipeline = authtoken context registryapp
[app:registryapp]
-
paste.app_factory = glance.common.wsgi:app_factory
glance.app_factory = glance.registry.api.v1:API
[filter:context]
-
context_class = glance.registry.context.RequestContext
paste.filter_factory = glance.common.wsgi:filter_factory
glance.filter_factory = glance.common.context:ContextMiddleware
[filter:authtoken]
-
paste.filter_factory = keystone.middleware.auth_token:filter_factory
-
+# FIXME(dtroyer): remove these service_* entries after auth_token is updated
service_host = %KEYSTONE_SERVICE_HOST%
service_port = %KEYSTONE_SERVICE_PORT%
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
-
auth_host = %KEYSTONE_AUTH_HOST%
auth_port = %KEYSTONE_AUTH_PORT%
auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
-
-admin_token = %SERVICE_TOKEN%
admin_tenant_name = %SERVICE_TENANT_NAME%
admin_user = %SERVICE_USERNAME%
admin_password = %SERVICE_PASSWORD%
-
-[filter:auth-context]
-
-context_class = glance.registry.context.RequestContext
-paste.filter_factory = glance.common.wsgi:filter_factory
-glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
-
-
-
View
11 devstack/components/horizon.py
@@ -74,9 +74,6 @@ def _get_download_locations(self):
})
return places
- def known_options(self):
- return set(['quantum-client'])
-
def verify(self):
comp.PythonInstallComponent.verify(self)
self._check_ug()
@@ -88,14 +85,6 @@ def _get_symlinks(self):
if link_tgt:
src = self._get_target_config_name(HORIZON_APACHE_CONF)
links[src] = link_tgt
- if 'quantum-client' in self.options:
- q_name = self.options['quantum-client']
- if q_name in self.instances:
- # TODO remove this junk, blah, puke that we have to do this
- qc = self.instances[q_name]
- src_pth = sh.joinpths(qc.app_dir, 'quantum')
- tgt_dir = sh.joinpths(self.dash_dir, 'quantum')
- links[src_pth] = tgt_dir
return links
def _check_ug(self):
View
4 devstack/components/keystone.py
@@ -68,14 +68,14 @@
'catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s',
'catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/',
'catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s',
- "catalog.RegionOne.object_store.name = 'Swift Service'"]
+ "catalog.RegionOne.object_store.name = Swift Service"]
# Quantum template additions
# TODO: get rid of these
QUANTUM_TEMPL_ADDS = ['catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:9696/',
'catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:9696/',
'catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:9696/',
- "catalog.RegionOne.network.name = 'Quantum Service'"]
+ "catalog.RegionOne.network.name = Quantum Service"]
class KeystoneUninstaller(comp.PythonUninstallComponent):

0 comments on commit cd724c3

Please sign in to comment.
Something went wrong with that request. Please try again.