From: Steven Hardy Date: Fri, 8 Feb 2013 11:34:58 +0000 (+0000) Subject: heat clients : Make boto client select http/https from configfile X-Git-Tag: 2014.1~917^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d4999382a5bbf2be2399464f4fd8280d1123b526;p=openstack-build%2Fheat-build.git heat clients : Make boto client select http/https from configfile Currently we hardcode is_secure=False, but boto supports configuration of this option from the config file (either ~/.boto or /etc/boto.cfg) so better to do that NOTE - you will need to update your boto config to include is_secure=0 to retain current (non https) behavior, since it defaults to on ref bug 1117594 Change-Id: Ic13e8604f12d3d5be4ec132a1bc04ae7624ec85d Signed-off-by: Steven Hardy --- diff --git a/etc/boto.cfg b/etc/boto.cfg index eb911c0e..06ee3483 100644 --- a/etc/boto.cfg +++ b/etc/boto.cfg @@ -11,6 +11,9 @@ # Make boto output verbose debugging information debug = 0 +# Disable https connections +is_secure = 0 + # Override the default AWS endpoint to connect to heat on localhost cfn_region_name = heat cfn_region_endpoint = 127.0.0.1 diff --git a/heat/cfn_client/boto_client.py b/heat/cfn_client/boto_client.py index 2914a4f9..03b0a5bf 100644 --- a/heat/cfn_client/boto_client.py +++ b/heat/cfn_client/boto_client.py @@ -286,11 +286,9 @@ def get_client(host, port=None, username=None, # Note we pass None/None for the keys by default # This means boto reads /etc/boto.cfg, or ~/.boto - # Also note is_secure is defaulted to False as HTTPS connections - # don't seem to work atm, FIXME + # set is_secure=0 in the config to disable https cloudformation = BotoClient(aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key, - is_secure=False, port=port, path="/v1") if cloudformation: