Merge remote-tracking branch 'starlingx/master' into HEAD

Change-Id: I0860f2105e5a7b75066019d7373ea0a4b54064c7
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2019-02-15 12:14:24 -05:00
commit 681dd797bd
1 changed files with 1 additions and 1 deletions

View File

@ -2442,7 +2442,7 @@ class HostController(rest.RestController):
# tell conductor to delete the barbican entry associated with this host (if present)
pecan.request.rpcapi.delete_barbican_secret(pecan.request.context,
host.uuid)
ihost.uuid)
# Notify patching to drop the host
if ihost.hostname is not None: