Revert "Revert "Change path for validation Ansible files""
Depends-On: https://review.opendev.org/753709
This reverts commit cbb3375a47
.
Change-Id: I83ed0d633ffa04c1133dbeb77b32eafe854f6252
This commit is contained in:
parent
6a2c9d0315
commit
b3ac0493f1
|
@ -17,7 +17,7 @@
|
||||||
import logging
|
import logging
|
||||||
from validations_common.validation import Validation
|
from validations_common.validation import Validation
|
||||||
|
|
||||||
TRIPLEO_VALIDATION_DIR = "/usr/share/openstack-tripleo-validations"
|
TRIPLEO_VALIDATION_DIR = "/usr/share/ansible/"
|
||||||
|
|
||||||
|
|
||||||
class TripleOValidation(Validation):
|
class TripleOValidation(Validation):
|
||||||
|
@ -34,7 +34,7 @@ class TripleOValidation(Validation):
|
||||||
for action in tripleo_parser._actions:
|
for action in tripleo_parser._actions:
|
||||||
if action.dest == 'validation_dir':
|
if action.dest == 'validation_dir':
|
||||||
if action.default == parser.validation_dir:
|
if action.default == parser.validation_dir:
|
||||||
parser.validation_dir = "{}/playbooks".format(
|
parser.validation_dir = "{}/validation-playbooks".format(
|
||||||
TRIPLEO_VALIDATION_DIR)
|
TRIPLEO_VALIDATION_DIR)
|
||||||
if action.dest == 'ansible_base_dir':
|
if action.dest == 'ansible_base_dir':
|
||||||
if action.default == parser.ansible_base_dir:
|
if action.default == parser.ansible_base_dir:
|
||||||
|
|
14
setup.cfg
14
setup.cfg
|
@ -31,10 +31,10 @@ scripts =
|
||||||
scripts/tripleo-validation.py
|
scripts/tripleo-validation.py
|
||||||
|
|
||||||
data_files =
|
data_files =
|
||||||
share/openstack-tripleo-validations/ = hosts.sample
|
share/ansible = hosts.sample
|
||||||
share/openstack-tripleo-validations/ = groups.yaml
|
share/ansible = groups.yaml
|
||||||
share/openstack-tripleo-validations/roles = roles/*
|
share/ansible/roles = roles/*
|
||||||
share/openstack-tripleo-validations/playbooks = playbooks/*
|
share/ansible/validation-playbooks = playbooks/*
|
||||||
share/openstack-tripleo-validations/callback_plugins = callback_plugins/*
|
share/ansible/callback_plugins = callback_plugins/*
|
||||||
share/openstack-tripleo-validations/lookup_plugins = lookup_plugins/*
|
share/ansible/lookup_plugins = lookup_plugins/*
|
||||||
share/openstack-tripleo-validations/library = library/*
|
share/ansible/library = library/*
|
||||||
|
|
Loading…
Reference in New Issue