diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-05 22:35:25 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-06 12:36:10 -0800 |
| commit | ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1 (patch) | |
| tree | d9859ca110070160abeaeea0abf5c904091941ec /nova/image | |
| parent | 5fb0bdd7bf807a0886261ae6cf260dc7b6425e22 (diff) | |
| download | nova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.tar.gz nova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.tar.xz nova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.zip | |
Replaces pipelines with flag for auth strategy
Forcing deployers to modify a paste config file to change auth
strategies is very fragile. This simplifies things by keying
pipeline construction off of a single flag. Note that this will
require a small change to devstack.
Change-Id: I49728c356266e6084ecafb6c59542390137f89e9
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 5edab2655..4bbf7a7fc 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -38,7 +38,6 @@ LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS -flags.DECLARE('use_deprecated_auth', 'nova.auth.manager') GlanceClient = utils.import_class('glance.client.Client') @@ -60,7 +59,7 @@ def _parse_image_ref(image_href): def _create_glance_client(context, host, port): - if context.strategy == 'keystone': + if FLAGS.auth_strategy == 'keystone': # NOTE(dprince): Glance client just needs auth_tok right? Should we # add username and tenant to the creds below? creds = {'strategy': 'keystone', @@ -318,7 +317,7 @@ class GlanceImageService(object): # NOTE(vish): show is to check if image is available image_meta = self.show(context, image_id) - if FLAGS.use_deprecated_auth: + if FLAGS.auth_strategy == 'deprecated': # NOTE(parthi): only allow image deletions if the user # is a member of the project owning the image, in case of # setup without keystone |