openstack
/
python-tripleoclient
Code Issues Proposed changes

[Stable-Only]Reversing the legacy directory conditional 

The legacy directory can exist, but the validations don't have to be there.
In such a case, the legacy directory would still be used by VF,
instead of the new directory containing validation playbooks.

This patch reverses the condition, so that the client first
attempts to use the new validations playbook directory,
and only if it doesn't exist falls back to the legacy one.

Resolves: rhbz#2001968

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
(cherry picked from commit 9a586eb25d)
Change-Id: I6fb72ea7d170a2bcb0a1e3225d0fd8e9d97e0591
This commit is contained in:
Jiri Podivin 2021-09-09 14:52:29 +02:00
parent bcc25ecd24
commit c9ea9b3bd3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tripleoclient/constants.py
View File

@ -104,11 +104,10 @@ ANSIBLE_INVENTORY = \
'/var/lib/mistral/overcloud/{}'.format(TRIPLEO_STATIC_INVENTORY)
ANSIBLE_VALIDATION_DIR = (
os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR, 'playbooks')
if os.path.exists(os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR,
'playbooks'))
else "/usr/share/ansible/validation-playbooks"
)
"/usr/share/ansible/validation-playbooks"
if os.path.exists("/usr/share/ansible/validation-playbooks")
else os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR,
'playbooks'))
ANSIBLE_TRIPLEO_PLAYBOOKS = \
'/usr/share/ansible/tripleo-playbooks'