Merge "Add feature flag for beta drivers"

Author: Zuul

devstack/lib/magnum

@@ -239,6 +239,8 @@ function create_magnum_conf {
     default_volume_type=$(iniget /etc/cinder/cinder.conf DEFAULT default_volume_type)
     iniset $MAGNUM_CONF cinder default_docker_volume_type $default_volume_type
 
+    iniset $MAGNUM_CONF drivers enabled_beta_drivers $MAGNUM_BETA_DRIVERS
+
     iniset $MAGNUM_CONF kubernetes keystone_auth_default_policy $MAGNUM_K8S_KEYSTONE_AUTH_DEFAULT_POLICY
 
     write_uwsgi_config "$MAGNUM_UWSGI_CONF" "$MAGNUM_UWSGI" "/container-infra"

magnum/conf/drivers.py

@@ -36,6 +36,11 @@
                      ' Means if not specified, then all available drivers '
                      'are enabled.'
                 ),
+    cfg.ListOpt('enabled_beta_drivers',
+                default=[],
+                help='List of beta drivers to enable. Beta drivers are not '
+                     ' intended for production. Defaults to []. '
+                ),
 ]
 
 

magnum/drivers/common/driver.py

@@ -16,6 +16,7 @@
 
 import importlib_metadata as metadata
 from oslo_config import cfg
+from oslo_log import log as logging
 from stevedore import driver
 from stevedore import exception as stevedore_exception
 
@@ -24,11 +25,13 @@
 
 
 CONF = cfg.CONF
+LOG = logging.getLogger(__name__)
 
 
 class Driver(object, metaclass=abc.ABCMeta):
 
     definitions = None
+    beta = False
 
     @classmethod
     def load_entry_points(cls):
@@ -138,6 +141,17 @@ class Driver2(Driver):
                 os=os,
                 coe=coe)
         driver_info = definition_map[cluster_type]
+        driver_name = driver_info['entry_point_name']
+        beta = driver_info['class'].beta
+        if (beta and
+                driver_name not in CONF.drivers.enabled_beta_drivers):
+            LOG.info(f"Driver {driver_name} is beta "
+                     "and needs to be explicitly enabled with "
+                     "[drivers]/enabled_beta_drivers.")
+            raise exception.ClusterTypeNotSupported(
+                server_type=server_type,
+                os=os,
+                coe=coe)
         # TODO(muralia): once --drivername is supported as an input during
         # cluster create, change the following line to use driver name for
         # loading.