From 93318327fce1d8dbe386c7dd870fa8d0d006b3ca Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Tue, 27 Dec 2022 01:31:42 +0000
Subject: [PATCH] Update tox.ini to work with tox 4

This change will allow this repo to pass zuul now
that this has merged:
https://review.opendev.org/c/zuul/zuul-jobs/+/866943

Tox 4 deprecated whitelist_externals.
Replace whitelist_externals with allowlist_externals

Partial-Bug: #2000399

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: Ic19cac494dd1d1d256d8f6c2113f9ad6a36944cc
---
 ceph/ceph-manager/ceph-manager/tox.ini                 | 10 ++++++++--
 ceph/python-cephclient/python-cephclient/tox.ini       |  2 +-
 tox.ini                                                |  2 +-
 .../pci-irq-affinity-agent/pci_irq_affinity/tox.ini    |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ceph/ceph-manager/ceph-manager/tox.ini b/ceph/ceph-manager/ceph-manager/tox.ini
index 3fa5ba5d..43a86c4d 100644
--- a/ceph/ceph-manager/ceph-manager/tox.ini
+++ b/ceph/ceph-manager/ceph-manager/tox.ini
@@ -16,8 +16,14 @@ install_command = pip install -U --force-reinstall \
   {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
 commands = pytest {posargs}
-whitelist_externals = bash
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+allowlist_externals = bash
+passenv =
+  http_proxy
+  HTTP_PROXY
+  https_proxy
+  HTTPS_PROXY
+  no_proxy
+  NO_PROXY
 
 [testenv:py27]
 basepython = python2.7
diff --git a/ceph/python-cephclient/python-cephclient/tox.ini b/ceph/python-cephclient/python-cephclient/tox.ini
index 4bb4c6f2..2830a107 100644
--- a/ceph/python-cephclient/python-cephclient/tox.ini
+++ b/ceph/python-cephclient/python-cephclient/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
 install_command = pip install -U --force-reinstall {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
 commands = pytest {posargs}
-whitelist_externals = bash
+allowlist_externals = bash
 
 [testenv:py27]
 basepython = python2.7
diff --git a/tox.ini b/tox.ini
index 1e0492a2..94e4ae8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ setenv =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
-whitelist_externals =
+allowlist_externals =
     bash
 
 [testenv:bashate]
diff --git a/utilities/pci-irq-affinity-agent/pci_irq_affinity/tox.ini b/utilities/pci-irq-affinity-agent/pci_irq_affinity/tox.ini
index 73d0b88c..44a02c06 100644
--- a/utilities/pci-irq-affinity-agent/pci_irq_affinity/tox.ini
+++ b/utilities/pci-irq-affinity-agent/pci_irq_affinity/tox.ini
@@ -17,7 +17,7 @@ setenv =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
-whitelist_externals =
+allowlist_externals =
     bash
 commands =
     pytest pci_irq_affinity/tests/
@@ -82,4 +82,4 @@ description = Dummy environment to allow bandit to be run in subdir tox
 # further relies on "tox.skipsdist = True" above).
 deps = bindep
 commands = bindep test
-usedevelop = False
\ No newline at end of file
+usedevelop = False