openstack/kolla-ansible
Code Issues Proposed changes

Updated genpwd to work with python35

Browse Source 
Due to the changes in hmac.new and how binary strings
are dumped in yaml.safe_dump some changes were needed to
make sure that we dumped only strings, not binary strings.

Change-Id: Ic2fbcf2347023c1e9e666203dfe40dbeaf24ce5f
This commit is contained in:
Borne Mace 2018-05-22 16:33:40 -07:00
parent 2ca94a62d1
commit f1768ef7ab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kolla_ansible/cmd/genpwd.py
View File

@ -46,11 +46,11 @@ def generate_RSA(bits=4096):
encoding=serialization.Encoding.PEM, encoding=serialization.Encoding.PEM,
format=serialization.PrivateFormat.PKCS8, format=serialization.PrivateFormat.PKCS8,
encryption_algorithm=serialization.NoEncryption() encryption_algorithm=serialization.NoEncryption()
) ).decode()
public_key = new_key.public_key().public_bytes( public_key = new_key.public_key().public_bytes(
encoding=serialization.Encoding.OpenSSH, encoding=serialization.Encoding.OpenSSH,
format=serialization.PublicFormat.OpenSSH format=serialization.PublicFormat.OpenSSH
) ).decode()
return private_key, public_key return private_key, public_key
@ -112,12 +112,12 @@ def main():
passwords[k] = uuidutils.generate_uuid() passwords[k] = uuidutils.generate_uuid()
elif k in hmac_md5_keys: elif k in hmac_md5_keys:
passwords[k] = (hmac.new( passwords[k] = (hmac.new(
uuidutils.generate_uuid(), '', md5) uuidutils.generate_uuid().encode(), ''.encode(), md5)
.digest().encode('base64')[:-1]) .hexdigest())
elif k in hmac_sha256_keys: elif k in hmac_sha256_keys:
passwords[k] = (hmac.new( passwords[k] = (hmac.new(
uuidutils.generate_uuid(), '', sha256) uuidutils.generate_uuid().encode(), ''.encode(), sha256)
.digest().encode('base64')[:-1]) .hexdigest())
else: else:
passwords[k] = ''.join([ passwords[k] = ''.join([
random.SystemRandom().choice( random.SystemRandom().choice(