Update tripleo-validations path to /usr/share/ansible
According to: https://review.rdoproject.org/r/#/c/29059/
We decide to converge ansible roles/libraries/plugin and playbooks to
the /usr/share/ansible path instead of having a dedicated path for
validations.
This will avoid duplication since the validation-framework is now
an external framework from tripleo, the common validations between
validations-common and tripleo-validations can be stored at the same
place.
Add a fallback path for Updates and Upgrades
Change-Id: Ibe97d70f4d321d04900ca9fe88144bc16511611c
(cherry picked from commit df0cecfe55
)
This commit is contained in:
parent
c48385e5a3
commit
1de68cbbd6
|
@ -93,7 +93,10 @@ ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT = 600
|
|||
|
||||
ADDITIONAL_ARCHITECTURES = ['ppc64le']
|
||||
|
||||
DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/openstack-tripleo-validations'
|
||||
DEFAULT_VALIDATIONS_BASEDIR = (
|
||||
"/usr/share/ansible"
|
||||
if os.path.exists("/usr/share/ansible/validation-playbooks")
|
||||
else "/usr/share/openstack-tripleo-validations")
|
||||
|
||||
VALIDATIONS_LOG_BASEDIR = '/var/log/validations'
|
||||
|
||||
|
@ -103,8 +106,11 @@ DEFAULT_WORK_DIR = os.path.join(os.environ.get('HOME', '~/'),
|
|||
ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
|
||||
'{}/tripleo-ansible-inventory.yaml')
|
||||
|
||||
ANSIBLE_VALIDATION_DIR = \
|
||||
'/usr/share/openstack-tripleo-validations/playbooks'
|
||||
ANSIBLE_VALIDATION_DIR = (
|
||||
"/usr/share/ansible/validation-playbooks"
|
||||
if os.path.exists("/usr/share/ansible/validation-playbooks")
|
||||
else "/usr/share/openstack-tripleo-validations/playbooks")
|
||||
|
||||
ANSIBLE_TRIPLEO_PLAYBOOKS = \
|
||||
'/usr/share/ansible/tripleo-playbooks'
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ VALIDATIONS_LOGS_CONTENTS_LIST = [{
|
|||
'id': '008886df-d297-1eaa-2a74-000000000008',
|
||||
'validation_id': '512e',
|
||||
'validation_path':
|
||||
'/usr/share/openstack-tripleo-validations/playbooks'
|
||||
'/usr/share/ansible/validation-playbooks'
|
||||
},
|
||||
'tasks': [
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue