loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implementation Token Multi Service ENd

Browse source
This commit is contained in:
Eole 2016-01-31 14:34:43 +01:00
parent 3914858d7a
commit 4f062230bc
3 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/core/LibOverride/genTokenOptions.php
View file

@ -56,9 +56,11 @@ class genTokenOptions
$options['catalogType'] = 'false';
$options['region'] = 'RegionOne';
list($token, $baseUrl) = $options['identityService']->authenticate($options);
$this->stack->push(Middleware::authHandler($options['authHandler'], $token));
//list($token, $baseUrl) = $options['identityService']->authenticate($options);
$baseUrl = $options["authUrl"];
$token = $options['identityService']->generateToken($options);
$this->stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $this->stack);
@ -227,8 +229,8 @@ class genTokenOptions
return serialize($this->backup[$service]);
}
public function getOptionsCompute(){
return $this->optionsGlobal['Compute'];
public function getOptions($service){
return $this->optionsGlobal[$service];
}
private function serializeToken($token){