Merge "[Stable-Only]Reversing the legacy directory conditional" into stable/victoria
This commit is contained in:
commit
a6d3b5a07e
|
@ -102,12 +102,12 @@ TRIPLEO_STATIC_INVENTORY = 'tripleo-ansible-inventory.yaml'
|
|||
|
||||
ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
|
||||
'{}/', 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'
|
||||
|
|
Loading…
Reference in New Issue