diff options
| -rw-r--r-- | glustolibs-gluster/glustolibs/gluster/gluster_base_class.py | 9 | ||||
| -rw-r--r-- | tests/gluster_tests_config.yml | 10 |
2 files changed, 18 insertions, 1 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py index 09946d739..ee7a23f3c 100644 --- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py +++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py @@ -204,6 +204,13 @@ class GlusterBaseClass(unittest.TestCase): } } + # Default volume options which is applicable for all the volumes + cls.volume_options = {} + if ('volume_options' in g.config['gluster'] and + g.config['gluster']['volume_options']): + cls.volume_options = ( + g.config['gluster']['volume_options']) + # Get the volume configuration. cls.volume = {} if cls.volume_type: @@ -241,7 +248,7 @@ class GlusterBaseClass(unittest.TestCase): # Set volume options if 'options' not in cls.volume: - cls.volume['options'] = {} + cls.volume['options'] = cls.volume_options # Define Volume Useful Variables. cls.volname = cls.volume['name'] diff --git a/tests/gluster_tests_config.yml b/tests/gluster_tests_config.yml index d7783787a..bfc28232d 100644 --- a/tests/gluster_tests_config.yml +++ b/tests/gluster_tests_config.yml @@ -191,6 +191,16 @@ gluster: redundancy_count: 2 transport: tcp + # Volume options that has to be applicable to all volume types + volume_options: +## performance.quick-read: "off" +## performance.read-ahead: "off" +## performance.io-cache: "off" +## performance.stat-prefetch: "off" +## performance.open-behind: "off" +## performance.readdir-ahead: "off" +## server.allow-insecure: "on" + # slave volumes config goes under 'slave_volumes' section. This is a list # of all the slave volumes. slave_volumes: |