Merge pull request #77 from stackhpc/upstream/master-2025-06-30

Synchronise master with upstream

Author: priteau

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

@@ -131,7 +131,7 @@ dhcp_provider = {{ dhcp_provider }}
 [dnsmasq]
 dhcp_hostsdir = {{ dnsmasq_dhcp_hostsdir }}
 dhcp_optsdir = {{ dnsmasq_dhcp_optsdir }}
-leases_file = {{ dnsmasq_leases_file }}
+dhcp_leasefile = {{ dnsmasq_leases_file }}
 {% endif %}
 
 {% if enable_cors | bool == true %}

playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml

@@ -22,11 +22,6 @@
       --network-interface argument to "bifrost-cli install".
   when: ('ansible_' + ans_network_interface) not in hostvars[inventory_hostname]
 
-- name: "Get keystone-wsgi-public location"
-  shell: echo $(dirname $(which keystone-wsgi-public))
-  register: keystone_install_prefix
-  environment: "{{ bifrost_venv_env }}"
-
 # NOTE(sean-k-mooney) only the MySQL db is started during bootstrapping.
 # all other services are started in the Start phase.
 - name: "Start database service"
@@ -195,18 +190,6 @@
     group: "{{ nginx_user }}" # TODO(TheJulia): Split webserver user/group.
     mode: "0755"
 
-# Note(ashestakov): "copy" module in ansible doesn't support recursive
-# copying on remote host. "cp" command used instead.
-- name: "Copy keystone-wsgi-public  to /var/www/keystone/public"
-  command: cp -r "{{ keystone_install_prefix.stdout }}/keystone-wsgi-public" /var/www/keystone/public
-
-- name: "Ensure owner and mode of keystone-wsgi-public"
-  file:
-    path: /var/www/keystone/public
-    owner: "keystone"
-    group: "{{ nginx_user }}"
-    mode: "0754"
-
 - name: "Bootstrap uWSGI"
   include_role:
     name: bifrost-uwsgi-install

playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2

@@ -1,5 +1,8 @@
 # {{ ansible_managed }}
 [uwsgi]
+module = keystone.wsgi.api:application
+plugins = python
+
 master = true
 processes = 2
 threads = 2
@@ -18,4 +21,3 @@ uid = keystone
 gid = {{ nginx_user }}
 
 chdir = /var/www/keystone/
-wsgi-file = /var/www/keystone/public

playbooks/roles/bifrost-pip-install/tasks/main.yml

@@ -32,6 +32,10 @@
         # source installation if the package itself is in constraints.
         - not source_install | bool
 
+    - name: "Detect Python version in virtualenv"
+      command: "{{ ansible_python_interpreter }} -c 'import sys; print(\".\".join(map(str, sys.version_info[:3])))'"
+      register: ansible_python_interpreter_version
+
     - name: "Install {{ package }} package from pip using virtualenv"
       pip:
         name: "{{ package }}"
@@ -45,7 +49,7 @@
       retries: "{{ pip_install_retries }}"
       delay: "{{ pip_install_delay }}"
       when: not source_install | bool
-      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_facts.python_version is version('3.12', '<') else bifrost_venv_env }}"
+      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_python_interpreter_version.stdout is version('3.12', '<') else bifrost_venv_env }}"
 
     - name: "Install requirements from {{ sourcedir }} using pip"
       pip:
@@ -56,7 +60,7 @@
       retries: 5
       delay: 10
       when: source_install | bool
-      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_facts.python_version is version('3.12', '<') else bifrost_venv_env }}"
+      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_python_interpreter_version.stdout is version('3.12', '<') else bifrost_venv_env }}"
 
     # NOTE(dtantsur): do not use constraints here, it does not work when the
     # package itself is constrained.
@@ -66,4 +70,4 @@
         editable: "{{ developer_mode | bool }}"
         extra_args: "{{ extra_args }}"
       when: source_install | bool
-      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_facts.python_version is version('3.12', '<') else bifrost_venv_env }}"
+      environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_python_interpreter_version.stdout is version('3.12', '<') else bifrost_venv_env }}"

releasenotes/notes/fix-ironic-dhcplease-variable-86aa61377b1f74cf.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes error  DHCP lease file not found for dnsmasq dhcp provider.
+    Changed wrong DHCP lease variable name in ironic.conf.j2 template in bifrost-ironic-install role.

releasenotes/notes/keystone-uwsgi-fix-cd7e95d1f1fa8768.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes Keystone start-up by providing the correct WSGI entry point.

scripts/install-deps.sh

@@ -69,6 +69,12 @@ case ${ID,,} in
     # NOTE(rpittau): epel repos are installed but the content is purged
     # in  the CI images, we remove them and reinstall later
     sudo -E ${PKG_MANAGER} remove -y epel-release epel-next-release
+
+    if [[ $NAME == 'CentOS Stream' ]] && [[ $VERSION == 9 ]]; then
+        export CONSTRAINTS_FILE="$BIFROST_HOME/upper-constraints-cs9-py39.txt"
+        export UPPER_CONSTRAINTS_FILE=$CONSTRAINTS_FILE
+        export TOX_CONSTRAINTS_FILE=$CONSTRAINTS_FILE
+    fi
     ;;
 
     *) echo "ERROR: Supported package manager not found.  Supported: apt, dnf, yum, zypper"; exit 1;;

scripts/test-bifrost.sh

@@ -4,7 +4,7 @@ set -euxo pipefail
 
 export PYTHONUNBUFFERED=1
 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)"
-BIFROST_HOME=$SCRIPT_HOME/..
+export BIFROST_HOME=$SCRIPT_HOME/..
 USE_DHCP="${USE_DHCP:-false}"
 BUILD_IMAGE="${BUILD_IMAGE:-false}"
 BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'}