Merge pull request #26 from dtantsur/oc-sync

Sync from metal3-io/ironic-agent-image

Dockerfile.ocp

@@ -5,7 +5,7 @@ ARG EXTRA_PKGS_LIST
 ARG PATCH_LIST
 
 COPY ${PKGS_LIST}* ${EXTRA_PKGS_LIST:-$PKGS_LIST} ${PATCH_LIST:-$PKGS_LIST} /tmp/
-COPY prepare-image.sh patch-image.sh runironicagent /bin/
+COPY prepare-image.sh patch-image.sh /bin/
 
 RUN prepare-image.sh && \
   mkdir -p /etc/ironic-python-agent && \
@@ -15,4 +15,6 @@ COPY hardware_manager /tmp/hardware_manager
 
 RUN PBR_VERSION=1.0 pip3 install --no-index --verbose --prefix=/usr /tmp/hardware_manager
 
-ENTRYPOINT ["/bin/runironicagent"]
+COPY ironic-python-agent.conf /etc/ironic-python-agent/00-defaults.conf
+
+ENTRYPOINT ["ironic-python-agent", "--config-dir", "/etc/ironic-python-agent"]

Dockerfile.okd

@@ -5,7 +5,7 @@ ARG EXTRA_PKGS_LIST
 ARG PATCH_LIST
 
 COPY ${PKGS_LIST}* ${EXTRA_PKGS_LIST:-$PKGS_LIST} ${PATCH_LIST:-$PKGS_LIST} /tmp/
-COPY prepare-image.sh patch-image.sh runironicagent /bin/
+COPY prepare-image.sh patch-image.sh /bin/
 
 # Configure OpenStack repos
 RUN dnf install --setopt=install_weak_deps=False --setopt=tsflags=nodocs -y python3 python3-requests && \
@@ -19,4 +19,6 @@ COPY hardware_manager /tmp/hardware_manager
 
 RUN PBR_VERSION=1.0 pip3 install --no-index --verbose --prefix=/usr /tmp/hardware_manager
 
-ENTRYPOINT ["/bin/runironicagent"]
+COPY ironic-python-agent.conf /etc/ironic-python-agent/00-defaults.conf
+
+ENTRYPOINT ["ironic-python-agent", "--config-dir", "/etc/ironic-python-agent"]

hardware_manager/ironic_coreos_install.py

@@ -15,17 +15,12 @@
 import subprocess
 
 from ironic_lib import disk_utils
+from ironic_python_agent import efi_utils
 from ironic_python_agent import errors
 from ironic_python_agent import hardware
 from oslo_log import log
 import tenacity
 
-# Handle https://review.opendev.org/c/openstack/ironic-python-agent/+/815651
-try:
-    from ironic_python_agent.efi_utils import manage_uefi
-except ImportError:
-    from ironic_python_agent.extensions.image import _manage_uefi \
-        as manage_uefi
 
 LOG = log.getLogger()
 
@@ -104,7 +99,7 @@ def install_coreos(self, node, ports):
         boot = hardware.dispatch_to_managers('get_boot_info')
         if boot.current_boot_mode == 'uefi':
             LOG.info('Configuring UEFI boot from device %s', root)
-            manage_uefi(root)
+            efi_utils.manage_uefi(root)
 
         LOG.info('Successfully installed via CoreOS installer on device %s',
                  root)

ironic-python-agent.conf

@@ -0,0 +1,8 @@
+[DEFAULT]
+debug = True
+log_file = /var/log/ironic-python-agent.log
+use_stderr = True
+
+collect_lldp = True
+inspection_collectors = default,extra-hardware,logs
+inspection_dhcp_all_interfaces = True