ironic-python-agent-builder 7.0.0__tar.gz → 7.1.0__tar.gz

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/AUTHORS

@@ -24,6 +24,7 @@ Madhuri Kumari <madhuri.kumari@intel.com>
 Madhuri Kumari <madhuri.rai07@gmail.com>
 Maksim Malchuk <maksim.malchuk@gmail.com>
 Mark Goddard <mark@stackhpc.com>
+Mathieu Parent <math.parent@etik.com>
 Mathieu Parent <math.parent@gmail.com>
 Matt Anson <matta@stackhpc.com>
 Michael Davies <michael@the-davies.net>

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/ChangeLog

@@ -1,6 +1,19 @@
 CHANGES
 =======
 
+7.1.0
+-----
+
+* tox: Drop redundant injection of VIRTUAL\_ENV variable
+* re-enable simple-init by default
+* Drop redundant basepython
+* Make multiple integration jobs voting
+* Lockout configdrive reads on network boots
+* Fixed rescue ConditionPathExists flag
+* ci: Start running the advaned ironic job
+* Revert "Add simple-init by default"
+* Fix waiting config drive with the correct publisher id
+
 7.0.0
 -----
 

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ironic-python-agent-builder
-Version: 7.0.0
+Version: 7.1.0
 Summary: Tools and scripts to build Ironic Python Agent
 Home-page: https://docs.openstack.org/ironic-python-agent-builder/latest/
 Author: OpenStack

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/dib/ironic-python-agent-ramdisk/static/etc/systemd/system/ironic-agent-resolve-config-drive.service

@@ -13,3 +13,6 @@ RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
+RequiredBy=glean.service
+RequiredBy=glean-networkd.service
+RequiredBy=glean-nm.service

ironic_python_agent_builder-7.1.0/dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-resolve-configdrive.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -eux
+set -o pipefail
+
+echo "Resolving the configuration drive for Ironic."
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+# Inspired by/based on glean-early.sh
+# https://opendev.org/opendev/glean/src/branch/master/glean/init/glean-early.sh
+#
+# What this script does, given we have disabled glean-early from executing,
+# it mounts the configuration drive contents *if* appropriate. Otherwise
+# everything falls into the default dhcp/address discovery path.
+
+# Identify if we have an a publisher id set
+publisher_id=""
+if grep -q "ir_pub_id" /proc/cmdline; then
+    publisher_id=$(cat /proc/cmdline | sed -e 's/^.*ir_pub_id=//' -e 's/ .*$//')
+fi
+
+if grep -q "BOOTIF" /proc/cmdline; then
+    # This is clearly a network boot or agent boot operation, which means
+    # we should double check if we have a publisher_id from Ironic.
+    if [[ "${publisher_id,,}" == "" ]]; then
+        # No publisher ID is present on the command line, Stop here.
+        # No need to proceed.
+        echo "Non-vmedia based deploy detected - skipping configuration."
+        exit 1
+    fi
+fi
+
+# NOTE(TheJulia): We care about iso images, and would expect lower case as a
+# result. In the case of VFAT partitions, they would be upper case.
+CONFIG_DRIVE_LABEL="config-2"
+
+i=0
+while [ $i -lt 30 ] ; do
+    i=$((i + 1))
+
+    for device in $(lsblk -o PATH,LABEL | grep "$CONFIG_DRIVE_LABEL" | cut -d" " -f1); do
+        device_id=$(udevadm info --query=property --property=ID_FS_PUBLISHER_ID "$device" | sed s/ID_FS_PUBLISHER_ID=//)
+        if [[ "${publisher_id,,}" == "${device_id,,}" ]]; then
+            # SUCCESS! Valid device! Mount it!
+            echo "Device ${device} matches publisher id ${publisher_id}. Mounting..."
+            mkdir -p /mnt/config
+            mount -t iso9660 -o ro,mode=0700 "${device}" /mnt/config || true
+            # We've mounted the device, the world is happy.
+            exit 0
+        fi
+    done
+
+    sleep 1
+done
+
+# No device found
+echo "No valid configuration drive found for Ironic."
+lsblk -o PATH,LABEL
+exit 1

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/ironic_python_agent_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ironic-python-agent-builder
-Version: 7.0.0
+Version: 7.1.0
 Summary: Tools and scripts to build Ironic Python Agent
 Home-page: https://docs.openstack.org/ironic-python-agent-builder/latest/
 Author: OpenStack

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/ironic_python_agent_builder.egg-info/SOURCES.txt

@@ -88,7 +88,6 @@ releasenotes/notes/add-efibootmgr-d2a456de6b999612.yaml
 releasenotes/notes/add-efivar-f83fdf2d797396dc.yaml
 releasenotes/notes/add-ntpdate-3db2f8565fed761e.yaml
 releasenotes/notes/add-nvme-cli-590e42735476a549.yaml
-releasenotes/notes/add-simple-init-by-default-cfaa05c8178de93f.yaml
 releasenotes/notes/centos7-python3-185f1d35c37096c7.yaml
 releasenotes/notes/centos8-46a95956fd871c90.yaml
 releasenotes/notes/centos8-stream-d9c83190e987e07d.yaml
@@ -108,6 +107,7 @@ releasenotes/notes/excess-firmware-removal-debian-06c49a8604122b1c.yaml
 releasenotes/notes/extra-hardware-73e3c9b5a0143bfa.yaml
 releasenotes/notes/fix-early-fail-if-no-config-drive-2085609b044ac85f.yaml
 releasenotes/notes/fix-firmware-cleanup-revisited-3047b3bf415bc91c.yaml
+releasenotes/notes/fix-glean-configdrive-lockout-4afaa99a06e7a785.yaml
 releasenotes/notes/goodbye-bullseye-2484e954f7234ba5.yaml
 releasenotes/notes/ironic-lib-6a16f13fc6ec9a50.yaml
 releasenotes/notes/ironic-ramdisk-base-3bfb9b90ad416891.yaml
@@ -122,6 +122,7 @@ releasenotes/notes/no-iscsi-5d132e6468acab0b.yaml
 releasenotes/notes/no-sdparm-f77de72b5c0d7859.yaml
 releasenotes/notes/no-suse-e15d8384c423251c.yaml
 releasenotes/notes/python2-removal-dee895550b1959af.yaml
+releasenotes/notes/re-enable-simple-init-b1dd1edc2ba9d646.yaml
 releasenotes/notes/remove-PYOPTIMIZE_TINYIPA-ebde63911d140209.yaml
 releasenotes/notes/selinux-permissive-a059f42bb66373a1.yaml
 releasenotes/notes/tinycore13-caba5a4998bdd628.yaml

ironic_python_agent_builder-7.1.0/ironic_python_agent_builder.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "cc13094", "is_release": true}

ironic_python_agent_builder-7.1.0/releasenotes/notes/fix-glean-configdrive-lockout-4afaa99a06e7a785.yaml

@@ -0,0 +1,11 @@
+---
+fixes:
+  - |
+    Fixes issues which could be encountered where prior configuration drives
+    were considered valid for use by the configuration drive lockout script.
+    This was discovered shortly after ``simple-init`` was added as a default
+    element instead of an opt-in element for disk images. Because of the use
+    of glean, this only resulted in incorrect network configuration of the
+    agent in some cases for users utilizing upstream code. That support was
+    promptly reverted, and this fix developed. We anticipate the simple-init
+    element to be re-introduced at some point in the future.

ironic_python_agent_builder-7.1.0/releasenotes/notes/re-enable-simple-init-b1dd1edc2ba9d646.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixes the DHCP-less usage path by default through the simple-init element
+    being enabled as a diskimage-builder dependency by default. This change was
+    previously reverted to allow time to resolve bugs in the guard rail
+    logic. Initalization of configuration drive configuration with simple-init
+    is now handled appropriately.

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/tox.ini

@@ -1,14 +1,11 @@
 [tox]
 minversion = 3.18.0
 envlist = pep8
-ignore_basepython_conflict = true
 
 [testenv]
 usedevelop = True
-basepython = python3
 setenv =
-   VIRTUAL_ENV={envdir}
-   PYTHONWARNINGS=default::DeprecationWarning
+  PYTHONWARNINGS=default::DeprecationWarning
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -61,4 +58,4 @@ deps = codespell
 # note(JayF): {posargs} lets us run `tox -ecodespell -- -w` to get codespell
 #             to correct spelling issues in our code it's aware of.
 commands =
-  codespell {posargs}
+  codespell {posargs}

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/zuul.d/project.yaml

@@ -14,6 +14,8 @@
         - ironic-python-agent-check-image-dib-debian
         - ironic-python-agent-check-image-dib-debian-arm64
         - ironic-python-agent-check-image-dib-debian-extra
+        - ironic-tempest-standalone-advanced
+        - ipa-tempest-bios-ipmi-direct-src
         # Non-voting jobs
         - ironic-python-agent-check-image-dib-debian-bookworm:
             voting: false
@@ -21,8 +23,6 @@
             voting: false
         - ironic-python-agent-check-image-dib-ubuntu-arm64:
             voting: false
-        - ipa-tempest-bios-ipmi-direct-src:
-            voting: false
         - ironic-python-agent-builder-tox-codespell:
             voting: false
     gate:
@@ -36,6 +36,8 @@
         - ironic-python-agent-check-image-dib-debian
         - ironic-python-agent-check-image-dib-debian-arm64
         - ironic-python-agent-check-image-dib-debian-extra
+        - ipa-tempest-bios-ipmi-direct-src
+        - ironic-tempest-standalone-advanced
     post:
       jobs:
         - publish-openstack-python-branch-tarball

ironic_python_agent_builder-7.0.0/dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-resolve-configdrive.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -eux
-set -o pipefail
-
-echo "Resolving the configuration drive for Ironic."
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-# Inspired by/based on glean-early.sh
-# https://opendev.org/opendev/glean/src/branch/master/glean/init/glean-early.sh
-
-# Identify if we have an a publisher id set
-publisher_id=""
-if grep -q "ir_pub_id" /proc/cmdline; then
-    publisher_id=$(cat /proc/cmdline | sed -e 's/^.*ir_pub_id=//' -e 's/ .*$//')
-fi
-
-# NOTE(TheJulia): We care about iso images, and would expect lower case as a
-# result. In the case of VFAT partitions, they would be upper case.
-CONFIG_DRIVE_LABEL="config-2"
-
-i=0
-while [ $i -lt 30 ] ; do
-    i=$((i + 1))
-
-    # Identify the number of devices
-    device_count=$(lsblk -o PATH,LABEL | grep -c $CONFIG_DRIVE_LABEL || true)
-
-    [ $device_count -lt 1 ] || break
-    sleep 1
-done
-
-if [ $device_count -lt 1 ]; then
-    # Nothing to do here, exit!
-    exit 0
-else
-    # We have *something* to do here.
-    mkdir -p /mnt/config
-    if [[ "${publisher_id}" != "" ]]; then
-        # We need to enumerate through the devices, and obtain the
-        for device in $(lsblk -o PATH,LABEL|grep config-2|cut -f1 -d" "); do
-            device_id=$(udevadm info --query=property --property=ID_FS_PUBLISHER_ID $device | sed s/ID_FS_PUBLISHER_ID=//)
-            if [[ "${publisher_id,,}" == "${device_id,,}" ]]; then
-                # SUCCESS! Valid device! Do it!
-                echo "Device ${device} matches the ${publisher_id}. Mounting..."
-                mount -t iso9660 -o ro,mode=0700 "${device}" /mnt/config || true
-                # We've mounted the device, the world is happy.
-                exit 0
-            else
-                echo "Did not identify $device as a valid ISO for Ironic."
-            fi
-        done
-    fi
-fi

ironic_python_agent_builder-7.0.0/ironic_python_agent_builder.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "548bde7", "is_release": true}

ironic_python_agent_builder-7.0.0/releasenotes/notes/add-simple-init-by-default-cfaa05c8178de93f.yaml

@@ -1,8 +0,0 @@
----
-features:
-  - |
-    The default ``ironic-python-agent-builder`` elements for
-    ``diskimage-builder`` now includes the ``simple-init``
-    element by default. This enables resulting IPA images,
-    including the stock example artifact to support
-    DHCP-less virtual media deployments out of the box.

{ironic_python_agent_builder-7.0.0 → ironic_python_agent_builder-7.1.0}/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/ironic-python-agent.service

@@ -1,9 +1,9 @@
 [Unit]
 Description=Ironic Python Agent
 After=network-online.target
+ConditionPathExists=!/etc/.rescued
 
 [Service]
-ConditionPathExists=!/etc/.rescued
 ExecStartPre=/sbin/modprobe vfat
 ExecStart=/usr/local/bin/ironic-python-agent --config-dir /etc/ironic-python-agent.d/
 Restart=always