Replace deprecated "decodestring()" by "decodebytes()"
decodestring() is deprecated alias of decodebytes() https://docs.python.org/3/library/base64.html#base64.decodestring The same has been done for nova: https://review.openstack.org/#/c/610401/ Change-Id: If28dc7b9310b55e4d63ef7b2cdedbbdc944c9191
This commit is contained in:
parent
54a29e06ab
commit
df02dc1d13
@ -274,18 +274,18 @@ def configure_ssl():
|
|||||||
c = config()
|
c = config()
|
||||||
if ssl_available(c):
|
if ssl_available(c):
|
||||||
status_set('maintenance', 'installing SSL key and cert')
|
status_set('maintenance', 'installing SSL key and cert')
|
||||||
ssl_key = base64.decodestring(c['ssl-key'].encode())
|
ssl_key = base64.decodebytes(c['ssl-key'].encode())
|
||||||
write_file('/var/snap/vault/common/vault.key', ssl_key, perms=0o600)
|
write_file('/var/snap/vault/common/vault.key', ssl_key, perms=0o600)
|
||||||
ssl_cert = base64.decodestring(c['ssl-cert'].encode())
|
ssl_cert = base64.decodebytes(c['ssl-cert'].encode())
|
||||||
if c['ssl-chain']:
|
if c['ssl-chain']:
|
||||||
ssl_cert = ssl_cert + base64.decodestring(c['ssl-chain'].encode())
|
ssl_cert = ssl_cert + base64.decodebytes(c['ssl-chain'].encode())
|
||||||
write_file('/var/snap/vault/common/vault.crt', ssl_cert, perms=0o600)
|
write_file('/var/snap/vault/common/vault.crt', ssl_cert, perms=0o600)
|
||||||
set_state('vault.ssl.available')
|
set_state('vault.ssl.available')
|
||||||
else:
|
else:
|
||||||
remove_state('vault.ssl.available')
|
remove_state('vault.ssl.available')
|
||||||
|
|
||||||
if c['ssl-ca']:
|
if c['ssl-ca']:
|
||||||
ssl_ca = base64.decodestring(c['ssl-ca'].encode())
|
ssl_ca = base64.decodebytes(c['ssl-ca'].encode())
|
||||||
write_file('/usr/local/share/ca-certificates/vault-ca.crt',
|
write_file('/usr/local/share/ca-certificates/vault-ca.crt',
|
||||||
ssl_ca, perms=0o644)
|
ssl_ca, perms=0o644)
|
||||||
subprocess.check_call(['update-ca-certificates', '--fresh'])
|
subprocess.check_call(['update-ca-certificates', '--fresh'])
|
||||||
|
Loading…
Reference in New Issue
Block a user