diff options
Diffstat (limited to 'os_client_config/defaults.py')
| -rw-r--r-- | os_client_config/defaults.py | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/os_client_config/defaults.py b/os_client_config/defaults.py index 1231cce..3256478 100644 --- a/os_client_config/defaults.py +++ b/os_client_config/defaults.py @@ -12,41 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -import json import os -import threading + +from openstack.config import defaults _json_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), 'defaults.json') -_defaults = None -_defaults_lock = threading.Lock() def get_defaults(): - global _defaults - if _defaults is not None: - return _defaults.copy() - with _defaults_lock: - if _defaults is not None: - # Did someone else just finish filling it? - return _defaults.copy() - # Python language specific defaults - # These are defaults related to use of python libraries, they are - # not qualities of a cloud. - # - # NOTE(harlowja): update a in-memory dict, before updating - # the global one so that other callers of get_defaults do not - # see the partially filled one. - tmp_defaults = dict( - api_timeout=None, - verify=True, - cacert=None, - cert=None, - key=None, - ) - with open(_json_path, 'r') as json_file: - updates = json.load(json_file) - if updates is not None: - tmp_defaults.update(updates) - _defaults = tmp_defaults - return tmp_defaults.copy() + return defaults.get_defaults(json_path=_json_path) |