Browse Source

Merge "Revert "Change path for validation Ansible files""

tags/12.5.0
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
1f2d58e884
2 changed files with 9 additions and 9 deletions
  1. +2
    -2
      scripts/tripleo-validation.py
  2. +7
    -7
      setup.cfg

+ 2
- 2
scripts/tripleo-validation.py View File

@@ -17,7 +17,7 @@
import logging
from validations_common.validation import Validation

TRIPLEO_VALIDATION_DIR = "/usr/share/ansible/"
TRIPLEO_VALIDATION_DIR = "/usr/share/openstack-tripleo-validations"


class TripleOValidation(Validation):
@@ -34,7 +34,7 @@ class TripleOValidation(Validation):
for action in tripleo_parser._actions:
if action.dest == 'validation_dir':
if action.default == parser.validation_dir:
parser.validation_dir = "{}/validation-playbooks".format(
parser.validation_dir = "{}/playbooks".format(
TRIPLEO_VALIDATION_DIR)
if action.dest == 'ansible_base_dir':
if action.default == parser.ansible_base_dir:


+ 7
- 7
setup.cfg View File

@@ -31,10 +31,10 @@ scripts =
scripts/tripleo-validation.py

data_files =
share/ansible = hosts.sample
share/ansible = groups.yaml
share/ansible/roles = roles/*
share/ansible/validation-playbooks = playbooks/*
share/ansible/callback_plugins = callback_plugins/*
share/ansible/lookup_plugins = lookup_plugins/*
share/ansible/library = library/*
share/openstack-tripleo-validations/ = hosts.sample
share/openstack-tripleo-validations/ = groups.yaml
share/openstack-tripleo-validations/roles = roles/*
share/openstack-tripleo-validations/playbooks = playbooks/*
share/openstack-tripleo-validations/callback_plugins = callback_plugins/*
share/openstack-tripleo-validations/lookup_plugins = lookup_plugins/*
share/openstack-tripleo-validations/library = library/*

Loading…
Cancel
Save