Clarify storage driver env vars

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
owncloud · Oct 22, 2020 · e3309d6 · e3309d6
1 parent 91debc7
commit e3309d6
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 79 deletions.
diff --git a/.drone.star b/.drone.star
@@ -547,10 +547,10 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommitId, storage):
         'environment' : {
           #'OCIS_LOG_LEVEL': 'debug',
           'STORAGE_HOME_DRIVER': '%s' % (storage),
-          'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
-          'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/reva/root',
-          'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
-          'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
+          'STORAGE_DRIVER_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
+          'STORAGE_DRIVER_LOCAL_ROOT': '/srv/app/tmp/ocis/reva/root',
+          'STORAGE_DRIVER_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+          'STORAGE_DRIVER_OWNCLOUD_REDIS_ADDR': 'redis:6379',
           'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
           'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
           'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
@@ -1403,11 +1403,11 @@ def ocisServer(storage):
         #'OCIS_LOG_LEVEL': 'debug',
         'STORAGE_HOME_DRIVER': '%s' % (storage),
         'STORAGE_USERS_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
-        'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
-        'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+        'STORAGE_DRIVER_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
+        'STORAGE_DRIVER_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
         'STORAGE_METADATA_ROOT': '/srv/app/tmp/ocis/metadata',
-        'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
+        'STORAGE_DRIVER_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+        'STORAGE_DRIVER_OWNCLOUD_REDIS_ADDR': 'redis:6379',
         'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
         'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
         'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',

diff --git a/changelog/unreleased/update-storage-env-vars.md b/changelog/unreleased/update-storage-env-vars.md
@@ -0,0 +1,5 @@
+Change: Clarify storage driver env vars
+
+After renaming ocsi-reva to storage and combining the storage and data providers some env vars were confusingly named `STORAGE_STORAGE_...`. We are changing the prefix for driver related env vars to `STORAGE_DRIVER_...`. This makes changing the storage driver using eg.: `STORAGE_HOME_DRIVER=eos` and setting driver options using `STORAGE_DRIVER_EOS_LAYOUT=...` less confusing.
+
+https://github.com/owncloud/ocis/pull/729
diff --git a/docs/extensions/storage/storages.md b/docs/extensions/storage/storages.md
@@ -158,11 +158,11 @@ For a simple docker-compose setup, you can create a volume which will be used by
 The CERN eos storage has evolved with ownCloud and natively supports id based lookup, ETag propagation, subtree size accounting, sharing, trash and versions. To use it you need to change the default configuration of the `storage storage-home` command (or have a look at the Makefile ̀ eos-start` target):
 
 ```
-export STORAGE_STORAGE_HOME_DRIVER=eos
-export STORAGE_STORAGE_EOS_NAMESPACE=/eos
-export STORAGE_STORAGE_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
-export STORAGE_STORAGE_EOS_ENABLE_HOME=true
-export STORAGE_STORAGE_EOS_LAYOUT="dockertest/{{.Username}}"
+export STORAGE_HOME_DRIVER=eos
+export STORAGE_DRIVER_EOS_NAMESPACE=/eos
+export STORAGE_DRIVER_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
+export STORAGE_DRIVER_EOS_ENABLE_HOME=true
+export STORAGE_DRIVER_EOS_LAYOUT="dockertest/{{.Username}}"
 ```
 
 Running it locally also requires the `eos` and `xrootd` binaries. Running it using `make eos-start` will use CentOS based containers that already have the necessary packages installed.

diff --git a/docs/ocis/eos.md b/docs/ocis/eos.md
@@ -49,34 +49,30 @@ uid=20000(einstein) gid=30000(users) groups=30000(users),30001(sailing-lovers),3
 If the user is not found at first you might need to wait a few more minutes in case the ocis container is still compiling.
 {{< /hint >}}
 
-We also need to restart the storage-users service, so it picks up the changed environment. Without a restart it is not able to resolve users from LDAP.
+We also need to restart the storage-userprovider service, so it picks up the changed environment. Without a restart it is not able to resolve users from LDAP.
 ```
-docker-compose exec ocis ./bin/ocis kill storage-users
-docker-compose exec ocis ./bin/ocis run storage-users
+docker-compose exec ocis ./bin/ocis kill storage-userprovider
+docker-compose exec ocis ./bin/ocis run storage-userprovider
 ```
 
 ### 3. Home storage
 
-Kill the home storage. By default it uses the `owncloud` storage driver. We need to switch it to the `eoshome` driver and make it use the storage id of the eos storage provider:
+Kill the home storage. By default it uses the `ocis` storage driver. We need to switch it to the `eoshome` driver:
 
 ```
-docker-compose exec ocis ./bin/ocis kill storage-storage-home
-docker-compose exec -e STORAGE_STORAGE_HOME_DRIVER=eoshome -e STORAGE_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 ocis ./bin/ocis run storage-storage-home
+docker-compose exec ocis ./bin/ocis kill storage-home
+docker-compose exec -e STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run storage-home
 ```
 
-### 4. Home data provider
+### 4. Users storage
 
-Kill the home data provider. By default it uses the `owncloud` storage driver. We need to switch it to the `eoshome` driver and make it use the storage id of the eos storage provider:
+Kill the users storage. By default it uses the `ocis` storage driver. We need to switch it to the `eos` driver:
 
 ```
-docker-compose exec ocis ./bin/ocis kill storage-storage-home-data
-docker-compose exec -e STORAGE_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run storage-storage-home-data
+docker-compose exec ocis ./bin/ocis kill storage-users
+docker-compose exec -e STORAGE_USERS_DRIVER=eos ocis ./bin/ocis run storage-users
 ```
 
-{{< hint info >}}
-The difference between the *home storage* and the *home data provider* are that the former is responsible for metadata changes while the latter is responsible for actual data transfer. The *home storage* uses the cs3 api to manage a folder hierarchy, while the *home data provider* is responsible for moving bytes to and from the storage.
-{{< /hint >}}
-
 ## Verification
 
 Login with `einstein / relativity`, upload a file to einsteins home and verify the file is there using
@@ -199,7 +195,7 @@ The ocis logs can be accessed using `docker-compose logs ocis`. Add `-f` for fol
 1. `docker-compose exec ocis make clean build` to update the binary
 2. `docker-compose exec ocis ./bin/ocis kill <service>` to kill the service
 3. `docker-compose exec ocis ./bin/ocis run <service>` to start the service. Do not forget to set any env vars, eg.
-  `docker-compose exec -e STORAGE_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e STORAGE_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run storage-storage-home`
+  `docker-compose exec -e STORAGE_HOME_DRIVER=eoshome -e STORAGE_DRIVER_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"  ocis ./bin/ocis run storage-home`
 
 ### Creation and upload of files does not work
 

diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml
@@ -47,13 +47,13 @@ services:
       STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
       STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
       # TODO make id the default in ocis-storage
-      STORAGE_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
+      STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
       STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
       STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
       # common eos settings used for both drivers: eos and eoshome
-      STORAGE_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      STORAGE_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
-      STORAGE_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users"
+      STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
+      STORAGE_DRIVER_EOS_NAMESPACE: "/eos/dockertest/reva/users"
       # the eos end xrdcopy binaries use this env var to find the eos mgm
       EOS_MGM_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
 

diff --git a/ocis/go.sum b/ocis/go.sum
@@ -126,8 +126,7 @@ github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
 github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.35.0 h1:Pxqn1MWNfBCNcX7jrXCCTfsKpg5ms2IMUMmmcGtYJuo=
-github.com/aws/aws-sdk-go v1.35.0/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
+github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U=
 github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
@@ -268,11 +267,7 @@ github.com/cs3org/go-cs3apis v0.0.0-20200929101248-821df597ec8d/go.mod h1:UXha4T
 github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A=
 github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4=
 github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea/go.mod h1:FvYB+UPpuPCw0hH42qHVR1R2atZyy69METZI/zEaST8=
-github.com/cs3org/reva v1.2.2-0.20201006093611-4a9be347ac29 h1:bGdr8WQI3khh8/Uo7icnWOvIyGxnGUVvSSLvtEliuIE=
-github.com/cs3org/reva v1.2.2-0.20201006093611-4a9be347ac29/go.mod h1:c0MYy0goE5OGC8WPb5LLMZtCqymwSk2fiKVQANzy0zg=
-github.com/cs3org/reva v1.2.2-0.20201007135248-bccddc4b5a48 h1:ICRTh96BemJ+oOSgp8j4EM32Ye10jh+UWjMxKbVr30g=
-github.com/cs3org/reva v1.2.2-0.20201007135248-bccddc4b5a48/go.mod h1:A4Q/nQ8Vs+HeAduSFnM37fqxEM3uXVxhaHrNL+gWcBY=
-github.com/cs3org/reva v1.3.1-0.20201021065855-dc400f81ecbc/go.mod h1:rTJhfVoZggB5iSPH5oWqQSO+W1iTQIxNmaX/ueS9GAU=
+github.com/cs3org/reva v1.3.1-0.20201021130722-dd3a8c0f3881 h1:xhpamvgyDr0jCtjXZCTk8qOdnslxhz8dHym5KLh7gl8=
 github.com/cs3org/reva v1.3.1-0.20201021130722-dd3a8c0f3881/go.mod h1:NplJavkhPZvy8/9K9m95g6uddq3pATO62bovvevpsBw=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
@@ -393,6 +388,7 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-ldap/ldap/v3 v3.1.7/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
 github.com/go-ldap/ldap/v3 v3.2.3 h1:FBt+5w3q/vPVPb4eYMQSn+pOiz4zewPamYhlGMmc7yM=
 github.com/go-ldap/ldap/v3 v3.2.3/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
+github.com/go-ldap/ldap/v3 v3.2.4 h1:PFavAq2xTgzo/loE8qNXcQaofAaqIpI4WgaLdv+1l3E=
 github.com/go-ldap/ldap/v3 v3.2.4/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
 github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -636,6 +632,7 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
@@ -1063,9 +1060,7 @@ github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnh
 github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
 github.com/ory/fosite v0.30.2/go.mod h1:Lq9qQ9Sl6mcea2Tt8J7PU+wUeFYPZ+vg7N3zPVKGbN8=
 github.com/ory/fosite v0.32.2/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I=
-github.com/ory/fosite v0.34.0 h1:lCUX4f5BoiXBIRUYKeTne+aRl0v6StgWpyYKq+7ILw0=
-github.com/ory/fosite v0.34.0/go.mod h1:h+ize9gk0GvRyGjabriqSEmTkMhny+O95cijb8DVqPE=
-github.com/ory/fosite v0.35.0/go.mod h1:h+ize9gk0GvRyGjabriqSEmTkMhny+O95cijb8DVqPE=
+github.com/ory/fosite v0.35.1 h1:mGPcwVGwHA7Yy9wr/7LDps6BEXyavL32NxizL9eH53Q=
 github.com/ory/fosite v0.35.1/go.mod h1:h+ize9gk0GvRyGjabriqSEmTkMhny+O95cijb8DVqPE=
 github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90/go.mod h1:sxnvPCxChFuSmTJGj8FdMupeq1BezCiEpDjTUXQ4hf4=
 github.com/ory/go-acc v0.2.1/go.mod h1:0omgy2aa3nDBJ45VAKeLHH8ccPBudxLeic4xiDRtug0=
@@ -1385,6 +1380,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go
@@ -15,118 +15,118 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "storage-eos-namespace",
 			Value:       "/eos/dockertest/reva",
 			Usage:       "Namespace for metadata operations",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_NAMESPACE"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_NAMESPACE"},
 			Destination: &cfg.Reva.Storages.EOS.Root,
 		},
 		&cli.StringFlag{
 			Name: "storage-eos-shadow-namespace",
 			// Defaults to path.Join(c.Namespace, ".shadow")
 			Usage:       "Shadow namespace where share references are stored",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SHADOW_NAMESPACE"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SHADOW_NAMESPACE"},
 			Destination: &cfg.Reva.Storages.EOS.ShadowNamespace,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-share-folder",
 			Value:       "/Shares",
 			Usage:       "name of the share folder",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SHARE_FOLDER"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SHARE_FOLDER"},
 			Destination: &cfg.Reva.Storages.EOS.ShareFolder,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-binary",
 			Value:       "/usr/bin/eos",
 			Usage:       "Location of the eos binary",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_BINARY"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_BINARY"},
 			Destination: &cfg.Reva.Storages.EOS.EosBinary,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-xrdcopy-binary",
 			Value:       "/usr/bin/xrdcopy",
 			Usage:       "Location of the xrdcopy binary",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_XRDCOPY_BINARY"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_XRDCOPY_BINARY"},
 			Destination: &cfg.Reva.Storages.EOS.XrdcopyBinary,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-master-url",
 			Value:       "root://eos-mgm1.eoscluster.cern.ch:1094",
 			Usage:       "URL of the Master EOS MGM",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_MASTER_URL"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_MASTER_URL"},
 			Destination: &cfg.Reva.Storages.EOS.MasterURL,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-slave-url",
 			Value:       "root://eos-mgm1.eoscluster.cern.ch:1094",
 			Usage:       "URL of the Slave EOS MGM",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SLAVE_URL"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SLAVE_URL"},
 			Destination: &cfg.Reva.Storages.EOS.SlaveURL,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-cache-directory",
 			Value:       os.TempDir(),
 			Usage:       "Location on the local fs where to store reads",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_CACHE_DIRECTORY"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_CACHE_DIRECTORY"},
 			Destination: &cfg.Reva.Storages.EOS.CacheDirectory,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-eos-enable-logging",
 			Usage:       "Enables logging of the commands executed",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_ENABLE_LOGGING"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_ENABLE_LOGGING"},
 			Destination: &cfg.Reva.Storages.EOS.EnableLogging,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-eos-show-hidden-sysfiles",
 			Usage:       "show internal EOS files like .sys.v# and .sys.a# files.",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SHOW_HIDDEN_SYSFILES"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SHOW_HIDDEN_SYSFILES"},
 			Destination: &cfg.Reva.Storages.EOS.ShowHiddenSysFiles,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-eos-force-singleuser-mode",
 			Usage:       "force connections to EOS to use SingleUsername",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_FORCE_SINGLEUSER_MODE"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_FORCE_SINGLEUSER_MODE"},
 			Destination: &cfg.Reva.Storages.EOS.ForceSingleUserMode,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-eos-use-keytab",
 			Usage:       "authenticate requests by using an EOS keytab",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_USE_KEYTAB"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_USE_KEYTAB"},
 			Destination: &cfg.Reva.Storages.EOS.UseKeytab,
 		},
 		&cli.BoolFlag{
 			Name:        "storage-eos-enable-home",
 			Usage:       "enable the creation of home directories",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_ENABLE_HOME"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_ENABLE_HOME"},
 			Destination: &cfg.Reva.Storages.EOS.EnableHome,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-sec-protocol",
 			Usage:       "the xrootd security protocol to use between the server and EOS",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SEC_PROTOCOL"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SEC_PROTOCOL"},
 			Destination: &cfg.Reva.Storages.EOS.SecProtocol,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-keytab",
 			Usage:       "the location of the keytab to use to authenticate to EOS",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_KEYTAB"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_KEYTAB"},
 			Destination: &cfg.Reva.Storages.EOS.Keytab,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-single-username",
 			Usage:       "the username to use when SingleUserMode is enabled",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_SINGLE_USERNAME"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_SINGLE_USERNAME"},
 			Destination: &cfg.Reva.Storages.EOS.SingleUsername,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-layout",
 			Value:       "{{substr 0 1 .Username}}/{{.Username}}",
 			Usage:       `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `,
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_LAYOUT"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_LAYOUT"},
 			Destination: &cfg.Reva.Storages.EOS.UserLayout,
 		},
 		&cli.StringFlag{
 			Name:        "storage-eos-gatewaysvc",
 			Value:       "localhost:9142",
 			Usage:       "URL to use for the storage gateway service",
-			EnvVars:     []string{"STORAGE_STORAGE_EOS_GATEWAYSVC"},
+			EnvVars:     []string{"STORAGE_DRIVER_EOS_GATEWAYSVC"},
 			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
 		},
 	}

diff --git a/storage/pkg/flagset/driverlocal.go b/storage/pkg/flagset/driverlocal.go
@@ -12,7 +12,7 @@ func DriverLocalWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "storage-local-root",
 			Value:       "/var/tmp/ocis/local",
 			Usage:       "the path to the local storage root",
-			EnvVars:     []string{"STORAGE_STORAGE_LOCAL_ROOT"},
+			EnvVars:     []string{"STORAGE_DRIVER_LOCAL_ROOT"},
 			Destination: &cfg.Reva.Storages.Local.Root,
 		},
 	}