diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample index e70d43f7da..44bd166ec7 100644 --- a/etc/magnum/magnum.conf.sample +++ b/etc/magnum/magnum.conf.sample @@ -368,17 +368,17 @@ # Allowed network drivers for kubernetes baymodels. Use 'all' keyword # to allow all drivers supported for kubernetes baymodels. Supported -# network drivers include flannel. +# network drivers include flannel. (list value) #kubernetes_allowed_network_drivers = all -# Allowed network drivers for docker swarm baymodels. Use 'all' keyword -# to allow all drivers supported for swarm baymodels. Supported -# network drivers include docker. +# Allowed network drivers for docker swarm baymodels. Use 'all' +# keyword to allow all drivers supported for swarm baymodels. +# Supported network drivers include docker. (list value) #swarm_allowed_network_drivers = all -# Allowed network drivers for mesos baymodels. Use 'all' keyword -# to allow all drivers supported for mesos baymodels. Supported -# network drivers include docker. +# Allowed network drivers for mesos baymodels. Use 'all' keyword to +# allow all drivers supported for mesos baymodels. Supported network +# drivers include docker. (list value) #mesos_allowed_network_drivers = all diff --git a/magnum/opts.py b/magnum/opts.py index c1b5cccf5b..2dc30b36e4 100644 --- a/magnum/opts.py +++ b/magnum/opts.py @@ -17,6 +17,7 @@ import itertools import magnum.api.app import magnum.api.auth +import magnum.api.controllers.v1.baymodel import magnum.common.cert_manager from magnum.common.cert_manager import local_cert_manager import magnum.common.clients @@ -55,5 +56,6 @@ def list_opts(): ('certificates', itertools.chain(magnum.common.cert_manager.cert_manager_opts, local_cert_manager.local_cert_manager_opts, - )) + )), + ('baymodel', magnum.api.controllers.v1.baymodel.baymodel_opts), ]