Add missing auth plugin options in [barbican] section

These options are used for authentication of service user which get
access to the encryption secret keys.

Change-Id: I27f56028d1ac97e2c045c192ca2ca534ff87e994
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

manila/keymgr/barbican.py

@@ -22,6 +22,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import uuidutils
 
+from manila.common import client_auth
 from manila import exception
 
 
@@ -34,6 +35,12 @@ castellan_options.set_defaults(CONF)
 ks_loading.register_auth_conf_options(CONF, BARBICAN_GROUP)
 
 
+def list_opts():
+    # NOTE(tkajinam): This likely breaks when castellan fixes missing auth
+    # plugin options
+    return client_auth.AuthClientLoader.list_opts(BARBICAN_GROUP)
+
+
 def _require_barbican_key_manager_backend(conf):
     backend = conf.key_manager.backend
     if backend is None:

manila/opts.py

@@ -33,6 +33,7 @@ import manila.db.base
 import manila.exception
 import manila.image
 import manila.image.glance
+import manila.keymgr.barbican
 import manila.message.api
 import manila.network
 import manila.network.linux.interface
@@ -216,6 +217,7 @@ _opts = [
 _opts.extend(manila.network.neutron.api.list_opts())
 _opts.extend(manila.compute.nova.list_opts())
 _opts.extend(manila.image.glance.list_opts())
+_opts.extend(manila.keymgr.barbican.list_opts())
 _opts.extend(manila.volume.cinder.list_opts())