Merge pull request #56 from stackhpc/upstream/master-2025-02-24

Synchronise master with upstream

Author: priteau

doc/source/install/playbooks.rst

@@ -122,15 +122,15 @@ In order to really get started, you must install dependencies.
 With the addition of ansible collections, the ``env-setup.sh`` will install
 the collections in the default ansible ``collections_paths`` (according to your
 ansible.cfg) or you can specify the location setting
-``ANSIBLE_COLLECTIONS_PATHS``:
+``ANSIBLE_COLLECTIONS_PATH``:
 
 .. code-block:: bash
 
-    $ export ANSIBLE_COLLECTIONS_PATHS=/mydir/collections
+    $ export ANSIBLE_COLLECTIONS_PATH=/mydir/collections
 
 .. note::
 
-   If you are using a virtual environment ANSIBLE_COLLECTIONS_PATHS is
+   If you are using a virtual environment ANSIBLE_COLLECTIONS_PATH is
    automatically set. After Ansible Collections are installed,
    a symbolic link to to the installation is created in the bifrost playbook
    directory.

doc/source/user/howto.rst

@@ -295,7 +295,7 @@ the one Bifrost builds for you:
 .. code-block:: bash
 
     ./bifrost-cli deploy -e @baremetal-install-env.json \
-        --config-drive '{"meta_data": {"public_keys": {"0": "'"$(cat ~/.ssh/id_rsa.pub)"'"}}}' \
+        --configdrive '{"meta_data": {"public_keys": {"0": "'"$(cat ~/.ssh/id_rsa.pub)"'"}}}' \
 
 File images do not require a checksum:
 

playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml

@@ -38,7 +38,7 @@
 
 - name: "Set UUID from Ironic"
   set_fact:
-    uuid: "{{ node_info.baremetal_nodes[0].uuid }}"
+    uuid: "{{ node_info.baremetal_nodes[0].id }}"
   when:
     - uuid is undefined
     - name is defined

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -327,13 +327,6 @@ ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
 # conditional statements in the playbooks.
 noauth_mode: false
 
-# A work around for installing older releases, remove when no longer supporting
-# Ussuri.
-git_branch: master
-supports_http_auth: >-
-  {{ git_branch == "master"
-     or git_branch[7:] not in ["queens", "rocky", "stein", "train", "ussuri"] }}
-
 # Keystone Support
 # Default parameter if keystone is enabled, or disabled.
 enable_keystone: false

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

@@ -236,8 +236,6 @@ username = {{ ironic.service_catalog.username }}
 password = {{ ironic.service_catalog.password }}
 user_domain_id = default
 project_domain_id = default
-{% elif not supports_http_auth | bool %}
-auth_strategy = noauth
 {% else %}
 auth_strategy = http_basic
 auth_type = http_basic

scripts/env-setup.sh

@@ -19,7 +19,7 @@ fi
 ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${DEFAULT_PIP_ANSIBLE}}
 ANSIBLE_SOURCE_PATH=${ANSIBLE_SOURCE_PATH:-ansible${ANSIBLE_PIP_VERSION}}
 
-BIFROST_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATHS:-}
+BIFROST_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATH:-}
 PLAYBOOKS_LIBRARY_PATH=$(dirname $0)/../playbooks/library
 
 echo "Installing/upgrading Ansible"
@@ -33,9 +33,9 @@ ${PIP} install "${ANSIBLE_SOURCE_PATH}"
 
 ANSIBLE_GALAXY="${SUDO} ${VENV}/bin/ansible-galaxy"
 if [[ -z $BIFROST_COLLECTIONS_PATHS ]]; then
-    echo  "Setting ANSIBLE_COLLECTIONS_PATHS to virtualenv"
-    export ANSIBLE_COLLECTIONS_PATHS=${VENV}/collections
-    BIFROST_COLLECTIONS_PATHS=$ANSIBLE_COLLECTIONS_PATHS
+    echo  "Setting ANSIBLE_COLLECTIONS_PATH to virtualenv"
+    export ANSIBLE_COLLECTIONS_PATH=${VENV}/collections
+    BIFROST_COLLECTIONS_PATHS=$ANSIBLE_COLLECTIONS_PATH
 fi
 if [[ -n "$ANSIBLE_COLLECTION_SOURCE_PATH" ]]; then
     ${SUDO} mkdir -p "$BIFROST_COLLECTIONS_PATHS/ansible_collections/openstack"
@@ -51,10 +51,10 @@ else
 fi
 
 # Symlink Collections to the playbook directory. This removes the need of setting
-# ANSIBLE_COLLECTIONS_PATHS environment variable
+# ANSIBLE_COLLECTIONS_PATH environment variable
 if [ ! -e "$(dirname $0)/../playbooks/collections" ]; then
     echo "Creating a symbolic link to ansible collections in bifrost playbook directory"
-    ln -s ${ANSIBLE_COLLECTIONS_PATHS} "$(dirname $0)/../playbooks/collections"
+    ln -s ${ANSIBLE_COLLECTIONS_PATH} "$(dirname $0)/../playbooks/collections"
 fi
 
 if [[ "${BIFROST_HIDE_PROMPT:-false}" != true ]]; then

tools/ansible-lint.sh

@@ -16,7 +16,7 @@ rm -f "$DEST/ansible_collections/openstack/cloud"
 
 ln -s "$(realpath $SOURCE)" "$DEST/ansible_collections/openstack/cloud"
 
-export ANSIBLE_COLLECTIONS_PATHS="$(realpath $DEST)"
+export ANSIBLE_COLLECTIONS_PATH="$(realpath $DEST)"
 export ANSIBLE_LIBRARY="$(dirname $0)/../playbooks/library"
 export ANSIBLE_ROLES_PATH="$(dirname $0)/../playbooks/roles"
 

zuul.d/bifrost-jobs.yaml

@@ -204,7 +204,7 @@
     run: playbooks/ci/upgrade.yaml
     timeout: 9600
     vars:
-      upgrade_from: stable/2024.1
+      upgrade_from: stable/2024.2
       skip_upgrade:
         - openstack/diskimage-builder
 
@@ -227,7 +227,7 @@
     name: bifrost-slurp-upgrade
     parent: bifrost-upgrade
     vars:
-      upgrade_from: stable/2023.1
+      upgrade_from: stable/2024.1
 
 - job:
     name: bifrost-slurp-upgrade-ubuntu-jammy