summaryrefslogtreecommitdiff
path: root/ceilometerclient/v2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-07 18:41:02 +0000
committerGerrit Code Review <review@openstack.org>2015-01-07 18:41:02 +0000
commit5d53e0a4964ced211cf8d05186f8a90c2a22f7f1 (patch)
treecb6aec8e88940f6ec74ddc72461765c7384c18f0 /ceilometerclient/v2
parentd1e659b0fb688973d460055e3f301e8d9035ee76 (diff)
parent3f4b657f7a3dbd79ccad4558a85713a85d51c261 (diff)
downloadpython-ceilometerclient-5d53e0a4964ced211cf8d05186f8a90c2a22f7f1.tar.gz
Merge "Enable --os-insecure CLI option"
Diffstat (limited to 'ceilometerclient/v2')
-rw-r--r--ceilometerclient/v2/client.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/ceilometerclient/v2/client.py b/ceilometerclient/v2/client.py
index 85caf36..88616ba 100644
--- a/ceilometerclient/v2/client.py
+++ b/ceilometerclient/v2/client.py
@@ -15,6 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+from oslo.utils import strutils
+
from ceilometerclient import client as ceiloclient
from ceilometerclient.openstack.common.apiclient import client
from ceilometerclient.v2 import alarms
@@ -54,12 +56,15 @@ class Client(object):
if timeout <= 0:
timeout = None
+ insecure = strutils.bool_from_string(kwargs.get('insecure'))
+ verify = kwargs.get('verify', not insecure)
+
self.client = client.HTTPClient(
auth_plugin=self.auth_plugin,
region_name=kwargs.get('region_name'),
endpoint_type=kwargs.get('endpoint_type'),
original_ip=kwargs.get('original_ip'),
- verify=kwargs.get('verify'),
+ verify=verify,
cert=kwargs.get('cacert'),
timeout=timeout,
timings=kwargs.get('timings'),