diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf index 31db255777..dc48af55a4 100644 --- a/etc/glance-cache.conf +++ b/etc/glance-cache.conf @@ -36,6 +36,9 @@ registry_host = 0.0.0.0 # Port the registry server is listening on registry_port = 9191 +# Admin token to use if using Keystone +# admin_token = 123 + [app:glance-pruner] paste.app_factory = glance.image_cache.pruner:app_factory diff --git a/glance/image_cache/prefetcher.py b/glance/image_cache/prefetcher.py index b4be7c2bf7..dbce857ed7 100644 --- a/glance/image_cache/prefetcher.py +++ b/glance/image_cache/prefetcher.py @@ -42,7 +42,9 @@ def __init__(self, options): registry.configure_registry_client(options) def fetch_image_into_cache(self, image_id): - ctx = context.RequestContext(is_admin=True, show_deleted=True) + auth_tok = self.options.get('admin_token') + ctx = context.RequestContext(is_admin=True, show_deleted=True, + auth_tok=auth_tok) try: image_meta = registry.get_image_metadata(ctx, image_id) if image_meta['status'] != 'active': diff --git a/glance/image_cache/queue_image.py b/glance/image_cache/queue_image.py index 0809ece8db..683b9e0f99 100644 --- a/glance/image_cache/queue_image.py +++ b/glance/image_cache/queue_image.py @@ -41,7 +41,9 @@ def __init__(self, options): registry.configure_registry_client(options) def queue_image(self, image_id): - ctx = context.RequestContext(is_admin=True, show_deleted=True) + auth_tok = self.options.get('admin_token') + ctx = context.RequestContext(is_admin=True, show_deleted=True, + auth_tok=auth_tok) try: image_meta = registry.get_image_metadata(ctx, image_id) if image_meta['status'] != 'active':