wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for rackspace swift backends

Browse source
This commit is contained in:
Robin Appelman 2014-06-24 14:36:29 +02:00
parent 5756aba594
commit 159b603d13
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/private/files/objectstore/swift.php
View file

@ -23,6 +23,7 @@ namespace OC\Files\ObjectStore;
use Guzzle\Http\Exception\ClientErrorResponseException;
use OCP\Files\ObjectStore\IObjectStore;
use OpenCloud\OpenStack;
use OpenCloud\Rackspace;
class Swift implements IObjectStore {
@ -37,9 +38,6 @@ class Swift implements IObjectStore {
private $container;
public function __construct($params) {
if (!isset($params['username']) || !isset($params['password'])) {
throw new \Exception('Access Key and Secret have to be configured.');
}
if (!isset($params['container'])) {
$params['container'] = 'owncloud';
}
@ -48,24 +46,17 @@ class Swift implements IObjectStore {
$params['autocreate'] = false;
}
$secret = array(
'username' => $params['username'],
'password' => $params['password']
);
if (isset($params['tenantName'])) {
$secret['tenantName'] = $params['tenantName'];
}
if (isset($params['tenantId'])) {
$secret['tenantId'] = $params['tenantId'];
}
// the OpenCloud client library will default to 'cloudFiles' if $serviceName is null
$serviceName = null;
if ($params['serviceName']) {
$serviceName = $params['serviceName'];
}
$client = new OpenStack($params['url'], $secret);
if (isset($params['apiKey'])) {
$client = new Rackspace($params['url'], $params);
} else {
$client = new OpenStack($params['url'], $params);
}
$this->objectStoreService = $client->objectStoreService($serviceName, $params['region']);