From b7908156a16145872895d5591efd2ae2e1f6ad95 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 26 Mar 2014 09:39:59 +0100 Subject: [PATCH] Add a help text for auth_strategy Change-Id: I684546d839dbbdd502c7a91df66befedfdeb0c03 --- etc/marconi.conf.sample | 4 +++- marconi/queues/transport/base.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/etc/marconi.conf.sample b/etc/marconi.conf.sample index 24f146c94..ce2a80dbe 100644 --- a/etc/marconi.conf.sample +++ b/etc/marconi.conf.sample @@ -4,7 +4,9 @@ # Options defined in marconi.transport.base # -# (string value) +# Backend to use for authentication. For no auth, keep it +# empty. Existing strategies: keystone. See also the +# keystone_authtoken section below (string value) #auth_strategy= diff --git a/marconi/queues/transport/base.py b/marconi/queues/transport/base.py index b3869013a..a6655c923 100644 --- a/marconi/queues/transport/base.py +++ b/marconi/queues/transport/base.py @@ -20,7 +20,11 @@ from oslo.config import cfg _TRANSPORT_OPTIONS = ( - cfg.StrOpt('auth_strategy', default=''), + cfg.StrOpt('auth_strategy', default='', + help=('Backend to use for authentication. ' + 'For no auth, keep it empty. ' + 'Existing strategies: keystone. ' + 'See also the keystone_authtoken section below')), )