Conflicts:
nova/console/websocketproxy.py due to
I89df8f8fa111b730ddd0aa73ae09a8cd5d152dad missing from stable/stein
nova/consoleauth/manager.py and
nova/tests/unit/consoleauth/test_consoleauth.py due to consoleauth is
removed from stable/train but affected by the bug in stable/stein
Change-Id: I5b8fa4233d297722c3af08176901d12887bae3de
Closes-Bug: #1492140
(cherry picked from commit 26d4047e17eba9bc271f8868f1d0ffeec97b555e)
(cherry picked from commit d7826bcd761af035f3f76f67c607dde2a1d04e48)
Reviewed: https:/ /review. opendev. org/702181 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=d8fbf04f325 f593836f8d44b6b bf42b85bde94e3
Committed: https:/
Submitter: Zuul
Branch: stable/stein
commit d8fbf04f325f593 836f8d44b6bbf42 b85bde94e3
Author: Balazs Gibizer <email address hidden>
Date: Fri Aug 23 15:51:34 2019 +0200
Mask the token used to allow access to consoles
Hide the novncproxy token from the logs.
When backported this patch needs to be extended to handle the same issue
in the consoleauth service.
Co- Authored- By:paul- carlton2 <email address hidden> Authored- By:Tristan Cacqueray <email address hidden>
Co-
Conflicts: console/ websocketproxy. py due to a111b730ddd0aa7 3ae09a8cd5d152d ad missing from stable/stein
nova/
I89df8f8f
nova/ consoleauth/ manager. py and tests/unit/ consoleauth/ test_consoleaut h.py due to consoleauth is
nova/
removed from stable/train but affected by the bug in stable/stein
Change-Id: I5b8fa4233d2977 22c3af08176901d 12887bae3de c271f8868f1d0ff eec97b555e) 5f3f76f67c607dd e2a1d04e48)
Closes-Bug: #1492140
(cherry picked from commit 26d4047e17eba9b
(cherry picked from commit d7826bcd761af03