ironic-python-agent-builder 5.3.0__tar.gz → 5.4.0__tar.gz

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/ChangeLog

@@ -1,6 +1,18 @@
 CHANGES
 =======
 
+5.4.0
+-----
+
+* Remove centos7 specific logic check
+* Block glean-early.sh from running
+* Block cloud-init user-data loading
+* Match publisher id
+* reno: Update master for unmaintained/zed
+* Update master for stable/2024.1
+* reno: Update master for unmaintained/xena
+* reno: Update master for unmaintained/wallaby
+
 5.3.0
 -----
 

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ironic-python-agent-builder
-Version: 5.3.0
+Version: 5.4.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-5.3.0 → ironic-python-agent-builder-5.4.0}/dib/ironic-python-agent-ramdisk/environment.d/20-ipa-distro-family.bash

@@ -4,7 +4,7 @@ else
     export IPA_DISTRO_FAMILY=other
 fi
 
-if [[ ${DISTRO_NAME} =~ (centos|rhel) && ${DIB_RELEASE%-stream} > 7 ]]; then
+if [[ ${DISTRO_NAME} =~ (centos|rhel) ]]; then
     export DIB_DHCP_NETWORK_MANAGER_AUTO=${DIB_DHCP_NETWORK_MANAGER_AUTO:-true}
 fi
 

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/dib/ironic-python-agent-ramdisk/post-install.d/80-ironic-python-agent-ramdisk

@@ -31,6 +31,7 @@ case "$DIB_INIT_SYSTEM" in
         if $DIB_IPA_ENABLE_RESCUE; then
             systemctl enable ironic-agent-create-rescue-user.path
         fi
+        systemctl enable ironic-agent-resolve-config-drive.service
         # NOTE(rpittau) disable caching remote package index to prevent
         # delays due to failures.
         # This is a new service for dnf-based systems (e.g. Centos8) to speed
@@ -61,6 +62,16 @@ DHCP=yes" > /etc/systemd/network/99-dhcp.network
                 systemctl enable systemd-networkd
             fi
         fi
+        if [ -e /usr/lib/systemd/system/glean-early.service ]; then
+            # Disable Glean-early start
+            # Under normal cirumstances, glean-early attempts to mount a config
+            # drive, configure ssh and a hostname. We only need the mount, and we
+            # trigger that in ironic-agent-resolve-config-drive.service.
+            # This is largely because glean uses /mnt/config by default,
+            # where as cloud-init uses a random folder name.
+            systemctl disable glean-early.service || true
+            rm /usr/lib/systemd/system/glean-early.service
+        fi
         ;;
     sysv)
         update-rc.d iptables disable
@@ -70,3 +81,10 @@ DHCP=yes" > /etc/systemd/network/99-dhcp.network
         exit 1
         ;;
 esac
+
+# Blocks out userdata from being acted upon by cloud-init if present.
+if [[ -x /etc/cloud/cloud.cfg.d ]]; then
+    cat > /etc/cloud/cloud.cfg.d/94-ironic-python-agent-disable-userdata.cfg <<EOF
+allow_userdata: false
+EOF
+fi

ironic-python-agent-builder-5.4.0/dib/ironic-python-agent-ramdisk/static/etc/systemd/system/ironic-agent-resolve-config-drive.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Ironic agent config drive setup
+Wants=network-pre.target
+Before=network-pre.target
+After=local-fs.target
+
+[Service]
+ExecStart=/bin/bash /usr/local/bin/ironic-python-agent-resolve-configdrive.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

ironic-python-agent-builder-5.4.0/dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-resolve-configdrive.sh

@@ -0,0 +1,47 @@
+#!/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
+
+# 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"
+
+# Identify the number of devices
+device_count=$(lsblk -o PATH,LABEL | grep $CONFIG_DRIVE_LABEL | wc -l)
+
+# 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 [ $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-5.3.0 → ironic-python-agent-builder-5.4.0}/ironic_python_agent_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ironic-python-agent-builder
-Version: 5.3.0
+Version: 5.4.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-5.3.0 → ironic-python-agent-builder-5.4.0}/ironic_python_agent_builder.egg-info/SOURCES.txt

@@ -41,7 +41,9 @@ dib/ironic-python-agent-ramdisk/post-install.d/99-remove-extra-packages
 dib/ironic-python-agent-ramdisk/static/etc/ironic-python-agent.d/README
 dib/ironic-python-agent-ramdisk/static/etc/systemd/system/ironic-agent-create-rescue-user.path
 dib/ironic-python-agent-ramdisk/static/etc/systemd/system/ironic-agent-create-rescue-user.service
+dib/ironic-python-agent-ramdisk/static/etc/systemd/system/ironic-agent-resolve-config-drive.service
 dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-create-rescue-user.sh
+dib/ironic-python-agent-ramdisk/static/usr/local/bin/ironic-python-agent-resolve-configdrive.sh
 dib/ironic-python-agent-tls/README.rst
 dib/ironic-python-agent-tls/element-deps
 dib/ironic-python-agent-tls/pre-finalise.d/10-configure-ipa-tls
@@ -112,6 +114,7 @@ releasenotes/notes/tinycore13-caba5a4998bdd628.yaml
 releasenotes/notes/tinyipa-tgt-226f74125238c239.yaml
 releasenotes/source/2023.1.rst
 releasenotes/source/2023.2.rst
+releasenotes/source/2024.1.rst
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/unreleased.rst

ironic-python-agent-builder-5.4.0/ironic_python_agent_builder.egg-info/pbr.json

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

ironic-python-agent-builder-5.4.0/releasenotes/source/2024.1.rst

@@ -0,0 +1,6 @@
+===========================
+2024.1 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2024.1

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/releasenotes/source/index.rst

@@ -6,6 +6,7 @@ Ironic Python Agent Builder Release Notes
    :maxdepth: 1
 
    unreleased
+   2024.1
    2023.2
    2023.1
    zed

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/releasenotes/source/wallaby.rst

@@ -3,4 +3,4 @@ Wallaby Series Release Notes
 ============================
 
 .. release-notes::
-   :branch: stable/wallaby
+   :branch: unmaintained/wallaby

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/releasenotes/source/xena.rst

@@ -3,4 +3,4 @@ Xena Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: stable/xena
+   :branch: unmaintained/xena

{ironic-python-agent-builder-5.3.0 → ironic-python-agent-builder-5.4.0}/releasenotes/source/zed.rst

@@ -3,4 +3,4 @@ Zed Series Release Notes
 ========================
 
 .. release-notes::
-   :branch: stable/zed
+   :branch: unmaintained/zed

ironic-python-agent-builder-5.3.0/ironic_python_agent_builder.egg-info/pbr.json

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