Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions bin/manager/libmanta.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
""" Module for Manta client wrapper and related tooling. """
import logging
import os
from manager.utils import debug, env
from manager.utils import debug, env, to_flag

# pylint: disable=import-error,dangerous-default-value,invalid-name
import manta as pymanta
Expand All @@ -21,16 +21,19 @@ def __init__(self, envs=os.environ):
self.key_id = env('MANTA_KEY_ID', None, envs)
self.url = env('MANTA_URL', 'https://us-east.manta.joyent.com', envs)
self.bucket = env('MANTA_BUCKET', '/{}/stor'.format(self.account), envs)
is_tls = env('MANTA_TLS_INSECURE', False, envs, fn=to_flag)

# we don't want to use `env` here because we have a different
# de-munging to do
self.private_key = envs.get('MANTA_PRIVATE_KEY', '').replace('#', '\n')
self.signer = pymanta.PrivateKeySigner(self.key_id, self.private_key)
self.client = pymanta.MantaClient(self.url,
self.account,
subuser=self.user,
role=self.role,
signer=self.signer)
self.client = pymanta.MantaClient(
self.url,
self.account,
subuser=self.user,
role=self.role,
disable_ssl_certificate_validation=is_tls,
signer=self.signer)

@debug
def get_backup(self, backup_id):
Expand Down