From 98b6c2a566812abdb1c89e9dec51331baea5ae14 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 8 Oct 2012 13:48:27 +0100 Subject: [PATCH] heat : boto_client_cloudwatch allow credentials override Allow the AWS key/secret to be passed in when making the client connection like boto_client.py Ref #222 Change-Id: Iee24120eb52c8ffb97b1b421b0a27313e5f5cbdd Signed-off-by: Steven Hardy --- heat/boto_client_cloudwatch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/boto_client_cloudwatch.py b/heat/boto_client_cloudwatch.py index 27d3e0da..76f0199a 100644 --- a/heat/boto_client_cloudwatch.py +++ b/heat/boto_client_cloudwatch.py @@ -189,7 +189,7 @@ class BotoCWClient(CloudWatchConnection): return '\n'.join(ret) -def get_client(port=None): +def get_client(port=None, aws_access_key=None, aws_secret_key=None): """ Returns a new boto CloudWatch client connection to a heat server Note : Configuration goes in /etc/boto.cfg, not via arguments @@ -198,8 +198,8 @@ def get_client(port=None): # Note we pass None/None for the keys so boto reads /etc/boto.cfg # Also note is_secure is defaulted to False as HTTPS connections # don't seem to work atm, FIXME - cloudwatch = BotoCWClient(aws_access_key_id=None, - aws_secret_access_key=None, is_secure=False, + cloudwatch = BotoCWClient(aws_access_key_id=aws_access_key, + aws_secret_access_key=aws_secret_key, is_secure=False, port=port, path="/v1") if cloudwatch: logger.debug("Got CW connection object OK") -- 2.45.2