diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-04-15 15:05:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 15:05:32 +0300 |
| commit | d8557d0d8a95e26fa3aeb3e8a6b9e2a454126411 (patch) | |
| tree | c31c6b0fda56feb42e1926cc14a14cbb706df847 /lib | |
| parent | 51fc07be3d2ef9a4d5dbe847a071f4f34bf0eb88 (diff) | |
| parent | 3e849daf11ad3c30143f2903fb7b528ef1f7da14 (diff) | |
Merge pull request #19540 from jlutran/fixKeystoneV3Auth
Fix issues with Keystone auth v3 in files_external app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/SwiftFactory.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 59446576400..7c8a1b995b4 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -119,6 +119,10 @@ class SwiftFactory { if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) { $this->params['tenantName'] = $this->params['tenant']; } + if (isset($this->params['domain'])) { + $this->params['scope']['project']['name'] = $this->params['tenant']; + $this->params['scope']['project']['domain']['name'] = $this->params['domain']; + } $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params); $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container']; |