sync oslo codeicehouse-eol1.0.12stable/icehouse

- sync code up to Change-Id: Ie6064e73abe4b0729498a0343d50e1be35684b75
- includes fix to resolve alarm-evaluator failure
- does not include openstack/common/strutils sync as it requires
  test update

Co-Authored-By: Vaibhav Kale <vaibhav_kale@persistent.co.in>
Closes-Bug: #1357343
Change-Id: Ieec08520cb39c5bf2e795dfeb3e36e52c6fd2a82

1 files changed, 3 insertions, 7 deletions

diff --git a/ceilometerclient/openstack/common/apiclient/auth.py b/ceilometerclient/openstack/common/apiclient/auth.py
index df9b674..2d9babe 100644
--- a/ceilometerclient/openstack/common/apiclient/auth.py
+++ b/ceilometerclient/openstack/common/apiclient/auth.py
@@ -19,7 +19,6 @@
 
 import abc
 import argparse
-import logging
 import os
 
 import six
@@ -28,9 +27,6 @@ from stevedore import extension
 from ceilometerclient.openstack.common.apiclient import exceptions
 
 
-logger = logging.getLogger(__name__)
-
-
 _discovered_plugins = {}
 
 
@@ -80,7 +76,7 @@ def load_plugin_from_args(args):
     alphabetical order.
 
     :type args: argparse.Namespace
-    :raises: AuthorizationFailure
+    :raises: AuthPluginOptionsMissing
     """
     auth_system = args.os_auth_system
     if auth_system:
@@ -217,8 +213,8 @@ class BaseAuthPlugin(object):
         :type service_type: string
         :param endpoint_type: Type of endpoint.
                               Possible values: public or publicURL,
-                                  internal or internalURL,
-                                  admin or adminURL
+                              internal or internalURL,
+                              admin or adminURL
         :type endpoint_type: string
         :returns: tuple of token and endpoint strings
         :raises: EndpointException