From 056fe669bc995681d1352e8b0ee6f09786d6c6d3 Mon Sep 17 00:00:00 2001
From: masco <mkaliyam@redhat.com>
Date: Wed, 23 Jul 2025 14:25:05 +0530
Subject: [PATCH] pump the rally_openstack to latest version

Change-Id: I2d4decb25c5fd166a87856d9eaa408e59761a9b5
---
 .pre-commit-config.yaml            |  2 +-
 ansible/install/group_vars/all.yml | 15 ++++++++-------
 tools-requirements.txt             |  7 ++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 65f1e9fd5..2de52aa85 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-merge-conflict
       - id: debug-statements
   - repo: https://github.com/ansible/ansible-lint
-    rev: v6.17.2
+    rev: v25.6.1
     hooks:
       - id: ansible-lint
         always_run: true
diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index 1bb748dad..517a2dd1b 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -6,24 +6,25 @@
 
 # Adjust Browbeat user if you are deploying Browbeat on a different machine
 # other than kni provisoner host. use 'stack' if you deploying in undercloud
-browbeat_user: kni
+browbeat_user: root
 # Login user for the local/jump machine (Typically Undercloud)
 local_remote_user: stack
 # Login user for the Overcloud hosts
 host_remote_user: heat-admin
 
 is_rhoso_deployment: true
-python_interpreter: /usr/bin/python3.6
-kubeconfig_path: /home/kni/clusterconfigs/auth/kubeconfig
+python_interpreter: "{{ '/usr/bin/python3.9' if is_rhoso_deployment else '/usr/bin/python3.6' }}"
+kubeconfig_path: /root/mno/kubeconfig
 kube_burner_path: https://github.com/cloud-bulldozer/kube-burner/releases/download/v1.7.12/kube-burner-V1.7.12-linux-x86_64.tar.gz
 ocp_metrics_query: roles/index-ocp-data/templates/metrics.yaml
 kubeburner_index_interval: 10 #in minutes
 
 # OpenStack Installer
-# Tripleo is the only installer supported currently
-tripleo: true
+# Tripleo is the only installer supported for non RHOSO deployments
+tripleo: false
 
-home_dir: "/home/{{browbeat_user}}"
+# if your browbeat user is not root, you need to change this to /home/{{browbeat_user}}
+home_dir: "/{{browbeat_user}}"
 browbeat_path: "{{home_dir}}/browbeat"
 
 # Creates rally deployment Undercloud
@@ -45,7 +46,7 @@ browbeat_venv: "{{browbeat_path}}/.browbeat-venv"
 rally_venv: "{{browbeat_path}}/.rally-venv"
 
 # Rally version to install
-rally_openstack_version: 2.2.0
+rally_openstack_version: "{{ '3.0.0' if is_rhoso_deployment else '2.2.0' }}"
 
 # The default Shaker venv
 shaker_venv: "{{browbeat_path}}/.shaker-venv"
diff --git a/tools-requirements.txt b/tools-requirements.txt
index c739c0d6c..560541dc4 100644
--- a/tools-requirements.txt
+++ b/tools-requirements.txt
@@ -1,4 +1,6 @@
-setuptools>=40.3.0
+setuptools>=80.9.0;python_version>='3.9'
+setuptools<80.9.0;python_version<'3.9'
+wheel
 elasticsearch
 scapy
 pyrsistent==0.16.0;python_version<'3'
@@ -6,3 +8,6 @@ pyrsistent>=0.17.0;python_version>='3'
 paramiko==2.8.0
 python-manilaclient<=3.0.0
 python-novaclient<18.3.0
+oslo.utils>=3.36.0
+oslo.log>=3.36.0
+oslo.serialization