From 0f286a07a95209bc2aebb503a129c585d620ae19 Mon Sep 17 00:00:00 2001 From: Deepak Date: Tue, 4 Oct 2016 23:07:56 +0530 Subject: [PATCH] Update test-vars.yml for repositories Renamed in os_designate role repo Changed test-vars.yml to os_designate-overrides.yml Removed the test-vars.yml file Change-Id: Ic3d5c3094d96cf0026564fcc8407157dfc87cec4 Partial-Bug: #1629284 --- tests/{test-vars.yml => os_designate-overrides.yml} | 0 tests/test-designate-functional.yml | 1 - tests/test-install-designate.yml | 2 -- tests/test-install-tempest.yml | 1 - tox.ini | 1 + 5 files changed, 1 insertion(+), 4 deletions(-) rename tests/{test-vars.yml => os_designate-overrides.yml} (100%) diff --git a/tests/test-vars.yml b/tests/os_designate-overrides.yml similarity index 100% rename from tests/test-vars.yml rename to tests/os_designate-overrides.yml diff --git a/tests/test-designate-functional.yml b/tests/test-designate-functional.yml index cd0eb3c..30888b3 100644 --- a/tests/test-designate-functional.yml +++ b/tests/test-designate-functional.yml @@ -24,4 +24,3 @@ {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env --serial designate_tempest_plugin.tests.scenario.v2.test_zones vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tests/test-install-designate.yml b/tests/test-install-designate.yml index 7757207..7749fba 100644 --- a/tests/test-install-designate.yml +++ b/tests/test-install-designate.yml @@ -97,7 +97,6 @@ - role: "os_designate" vars_files: - common/test-vars.yml - - test-vars.yml - name: Import pools @@ -115,4 +114,3 @@ {{ designate_bin }}/designate-manage pool update --file /etc/designate/pools.yaml vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tests/test-install-tempest.yml b/tests/test-install-tempest.yml index b8a81d3..7b6ed39 100644 --- a/tests/test-install-tempest.yml +++ b/tests/test-install-tempest.yml @@ -21,4 +21,3 @@ - role: "os_tempest" vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tox.ini b/tox.ini index 147f35a..d078c49 100644 --- a/tox.ini +++ b/tox.ini @@ -136,6 +136,7 @@ deps = commands = {[testenv:ansible]commands} ansible-playbook -i {toxinidir}/tests/inventory \ + -e @{toxinidir}/tests/os_designate-overrides.yml \ {toxinidir}/tests/test.yml -vvvv {[testenv:func_logs]commands}