merge #1031

scality · Dec 5, 2017 · e57b821 · e57b821
2 parents db57966 + 023f687
commit e57b821
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/config.json b/config.json
@@ -27,7 +27,8 @@
     "cdmi": {
         "host": "localhost",
         "port": 81,
-        "path": "/dewpoint"
+        "path": "/dewpoint",
+        "readonly": true
     },
     "bucketd": {
         "bootstrap": ["localhost"]

diff --git a/lib/Config.js b/lib/Config.js
@@ -394,6 +394,14 @@ class Config extends EventEmitter {
                        'bad config: cdmi.path is empty');
                 assert(config.cdmi.path.charAt(0) === '/',
                        'bad config: cdmi.path should start with a "/"');
+                this.cdmi.path = config.cdmi.path;
+            }
+            if (config.cdmi.readonly !== undefined) {
+                assert(typeof config.cdmi.readonly === 'boolean',
+                       'bad config: cdmi.readonly must be a boolean');
+                this.cdmi.readonly = config.cdmi.readonly;
+            } else {
+                this.cdmi.readonly = true;
             }
         }
 

diff --git a/lib/data/wrapper.js b/lib/data/wrapper.js
@@ -44,6 +44,7 @@ if (config.backends.data === 'mem') {
         path: config.cdmi.path,
         host: config.cdmi.host,
         port: config.cdmi.port,
+        readonly: config.cdmi.readonly,
     });
     implName = 'cdmi';
 }

diff --git a/lib/metadata/wrapper.js b/lib/metadata/wrapper.js
@@ -34,6 +34,7 @@ if (config.backends.metadata === 'mem') {
         path: config.cdmi.path,
         host: config.cdmi.host,
         port: config.cdmi.port,
+        readonly: config.cdmi.readonly,
     });
     implName = 'cdmi';
 }