diff options
| author | caoyuan <cao.yuan@99cloud.net> | 2016-11-30 03:55:13 +0800 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2016-11-30 07:28:00 +0800 |
| commit | cee89ee8bef92914036189d02745c08894a9955b (patch) | |
| tree | 3d6902ffe1d028292b8c65199874b1ac4cf240f7 | |
| parent | e74f947ff74659e61b3bdbbce65a2aab772812c3 (diff) | |
| download | kolla-cee89ee8bef92914036189d02745c08894a9955b.tar.gz kolla-cee89ee8bef92914036189d02745c08894a9955b.zip | |
Replaces uuid.uuid4 with uuidutils.generate_uuid()
Openstack common has a wrapper for generating uuids.
We should only use that function when generating uuids for consistency.
Fixed bug #1082248
Change-Id: I9db4da4fb774109720abb0852fad30cc8e17aafb
| -rwxr-xr-x | kolla/cmd/genpwd.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kolla/cmd/genpwd.py b/kolla/cmd/genpwd.py index e548b9ab4..3cc013ee3 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 # 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 142f6f691..d204dac37 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 |