starlingx
/
config
Code Issues Proposed changes

Merge "Retrieve device image over lighttpd"

This commit is contained in:
Zuul 2021-03-03 19:34:06 +00:00 committed by Gerrit Code Review
parent 408c3533db 96a51f34fa
commit 62f18d3cce
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sysinv/sysinv/sysinv/sysinv/fpga_agent/manager.py
View File

@ -40,7 +40,6 @@ from glob import glob
import os
import shlex
import shutil
import time
import urllib
@ -140,20 +139,6 @@ def fetch_device_image(filename):
return local_path
def fetch_device_image_local(filename):
# This is a hack since we only support AIO for now. Just copy the device
# image file into the well-known device image cache directory.
local_path = DEVICE_IMAGE_CACHE_DIR + "/" + filename
image_file_path = os.path.join(dconstants.DEVICE_IMAGE_PATH, filename)
try:
shutil.copyfile(image_file_path, local_path)
except (shutil.Error, IOError):
msg = ("Unable to retrieve device image from %s!" % image_file_path)
LOG.exception(msg)
raise exception.SysinvException(msg)
return local_path
def write_device_image_n3000(filename, pci_addr):
# Write the firmware image to the FPGA at the specified PCI address.
# We're assuming that the image update tools will catch the scenario
@ -607,15 +592,9 @@ class FpgaAgentManager(service.PeriodicService):
LOG.info("ensure device image cache exists")
ensure_device_image_cache_exists()
# Pull the image from the controller.
# Pull the image from the controller via HTTP
LOG.info("fetch device image %s" % filename)
# For now, we only need to support AIO nodes, so just copy the
# file from where we know sysinv-conductor put it.
local_path = fetch_device_image_local(filename)
# TODO: when we need to support standalone workers, we'll need to
# pull in the image file via HTTP.
# local_path = fetch_device_image(filename)
local_path = fetch_device_image(filename)
# TODO: check CSK used to sign image, ensure it hasn't been cancelled
# TODO: check root key used to sign image, ensure it matches root key of hardware