diff options
| author | Surya Prakash Singh <surya.singh@nectechnologies.in> | 2016-11-19 15:17:44 +0530 |
|---|---|---|
| committer | Surya Prakash Singh <surya.singh@nectechnologies.in> | 2016-11-23 20:36:55 +0530 |
| commit | 142919813975dc53ef77fbe87024112692511c55 (patch) | |
| tree | 6fccb6fd611b63c996232f93cf748d935d92fd19 | |
| parent | cf81e153cb419782974cd8f27efb277db716e4a6 (diff) | |
| download | kolla-ansible-142919813975dc53ef77fbe87024112692511c55.tar.gz kolla-ansible-142919813975dc53ef77fbe87024112692511c55.zip | |
use uuidutils instead of uuid.uuid4()
Closes-Bug: #1082248
Change-Id: I9e52619a6805fa58ffdb396b76a6ca99e2376a7d
| -rwxr-xr-x | kolla/cmd/genpwd.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/kolla/cmd/genpwd.py b/kolla/cmd/genpwd.py index e548b9ab4..5ed46410c 100755 --- a/kolla/cmd/genpwd.py +++ b/kolla/cmd/genpwd.py @@ -17,10 +17,10 @@ import os import random import string import sys -import uuid -import yaml from Crypto.PublicKey import RSA +from oslo_utils import uuidutils +import yaml # NOTE(SamYaple): Update the search path to prefer PROJECT_ROOT as the source # of packages to import if we are using local tools instead of @@ -81,7 +81,7 @@ def main(): if k in blank_keys and v is None: continue if k in uuid_keys: - passwords[k] = str(uuid.uuid4()) + passwords[k] = uuidutils.generate_uuid() else: passwords[k] = ''.join([ random.SystemRandom().choice( diff --git a/requirements.txt b/requirements.txt index bd0a71f3a..e22674da3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) six>=1.9.0 # MIT oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 +oslo.utils>=3.18.0 # Apache-2.0 setuptools!=24.0.0,>=16.0 # PSF/ZPL pycrypto>=2.6 # Public Domain netaddr!=0.7.16,>=0.7.13 # BSD |