Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Misc fixed around certificate syncing

Browse Source
This commit is contained in:
kevgliss
2015-08-18 16:17:20 -07:00
parent 0b9c814ea5
commit c6747439fb
10 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lemur/plugins/lemur_aws/plugin.py
View File

@ -6,6 +6,7 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
from boto.exception import BotoServerError
from lemur.plugins.bases import DestinationPlugin, SourcePlugin
from lemur.plugins.lemur_aws import iam, elb
from lemur.plugins import lemur_aws as aws
@ -42,7 +43,11 @@ class AWSDestinationPlugin(DestinationPlugin):
# }
def upload(self, name, body, private_key, cert_chain, options, **kwargs):
iam.upload_cert(find_value('accountNumber', options), name, body, private_key, cert_chain=cert_chain)
try:
iam.upload_cert(find_value('accountNumber', options), name, body, private_key, cert_chain=cert_chain)
except BotoServerError as e:
if e.error_code != 'EntityAlreadyExists':
raise Exception(e)
e = find_value('elb', options)
if e: