openstack/kolla-ansible
Code Issues Proposed changes

Merge "use uuidutils instead of uuid.uuid4()"

Browse Source
This commit is contained in:
Jenkins 2016-11-29 08:40:51 +00:00 committed by Gerrit Code Review
commit 8b8d10848f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kolla/cmd/genpwd.py
View File

@ -17,10 +17,10 @@ import os
import random import random
import string import string
import sys import sys
import uuid
import yaml
from Crypto.PublicKey import RSA 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 # 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 # 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: if k in blank_keys and v is None:
continue continue
if k in uuid_keys: if k in uuid_keys:
passwords[k] = str(uuid.uuid4()) passwords[k] = uuidutils.generate_uuid()
else: else:
passwords[k] = ''.join([ passwords[k] = ''.join([
random.SystemRandom().choice( random.SystemRandom().choice(

1
requirements.txt
View File

@ -8,6 +8,7 @@ gitdb>=0.6.4 # BSD License (3 clause)
GitPython>=1.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause)
six>=1.9.0 # MIT six>=1.9.0 # MIT
oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 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 setuptools!=24.0.0,>=16.0 # PSF/ZPL
pycrypto>=2.6 # Public Domain pycrypto>=2.6 # Public Domain
netaddr!=0.7.16,>=0.7.13 # BSD netaddr!=0.7.16,>=0.7.13 # BSD