diff --git a/magnum_tempest_plugin/common/config.py b/magnum_tempest_plugin/common/config.py index 74a6e0a..6a7e46e 100644 --- a/magnum_tempest_plugin/common/config.py +++ b/magnum_tempest_plugin/common/config.py @@ -78,6 +78,10 @@ class Config(object): else: cls.admin_role = 'admin' + @classmethod + def set_docker_storage_driver(cls, config): + cls.docker_storage_driver = CONF.magnum.get('docker_storage_driver') + @classmethod def set_region(cls, config): if 'region' in CONF.identity: @@ -153,6 +157,7 @@ class Config(object): cls.set_auth_url(config) cls.set_admin_role(config) + cls.set_docker_storage_driver(config) cls.set_region(config) cls.set_image_id(config) cls.set_nic_id(config) diff --git a/magnum_tempest_plugin/common/datagen.py b/magnum_tempest_plugin/common/datagen.py index be785f1..af9f3b8 100644 --- a/magnum_tempest_plugin/common/datagen.py +++ b/magnum_tempest_plugin/common/datagen.py @@ -505,6 +505,7 @@ def valid_cluster_template(is_public=False): http_proxy=None, https_proxy=None, no_proxy=None, network_driver=config.Config.network_driver, volume_driver=None, labels={}, + docker_storage_driver=config.Config.docker_storage_driver, tls_disabled=False) diff --git a/magnum_tempest_plugin/config.py b/magnum_tempest_plugin/config.py index 173b26b..9581bca 100644 --- a/magnum_tempest_plugin/config.py +++ b/magnum_tempest_plugin/config.py @@ -28,6 +28,9 @@ ServiceAvailableGroup = [ magnum_group = cfg.OptGroup(name="magnum", title="Magnum Options") MagnumGroup = [ + cfg.StrOpt("docker_storage_driver", + help="Docker storage driver. Supported: devicemapper, overlay"), + cfg.StrOpt("image_id", default="fedora-atomic-latest", help="Image id to be used for ClusterTemplate."),