Merge "[Stable-Only]Reversing the legacy directory conditional" into stable/train

This commit is contained in:
Zuul 2021-09-21 11:59:49 +00:00 committed by Gerrit Code Review
commit 9128791a30
1 changed files with 4 additions and 5 deletions

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'