Revision f724cd35 kamaki/cli/commands/image.py

b/kamaki/cli/commands/image.py
77 77 
        token = self.config.get('image', 'token')\
78 78 
            or self.config.get('compute', 'token')\
79 79 
            or self.config.get('global', 'token')
80 
        plankton_endpoints = self.auth_base.get_service_endpoints(
81 
            self.config.get('plankton', 'type'),
82 
            self.config.get('plankton', 'version'))
83 
        base_url = plankton_endpoints['publicURL']
80 84 
        base_url = self.config.get('image', 'url')\
81 85 
            or self.config.get('compute', 'url')\
82 86 
            or self.config.get('global', 'url')
......
305 309 
    def _get_pithos_client(self, container):
306 310 
        if self['no_metafile_upload']:
307 311 
            return None
308 
        purl = self.config.get('file', 'url')
312 
        pithos_endpoints = self.auth_base.get_service_endpoints(
313 
            self.config.get('pithos', 'type'),
314 
            self.config.get('pithos', 'version'))
315 
        purl = pithos_endpoints['publicURL']
309 316 
        ptoken = self.client.token
310 317 
        return PithosClient(purl, ptoken, self._get_uuid(), container)
311 318 

  		












Also available in:
  Unified diff