Rework the validator script, always include all the code
Include all the code for validation, but guard it with run-time variables that are properly initialized from the existing ansible variables. Switch prepare_tempest to false by default, the preparation code is generated anyway now. Change-Id: If2a7fcf864d380f2cb8af17881272ed3314834a7
This commit is contained in:
parent
2b72823cbf
commit
f785dceb91
@ -43,6 +43,6 @@ deploy_args: >-
|
||||
|
||||
step_deploy_overcloud: true
|
||||
step_validate_overcloud: true
|
||||
prepare_tempest: true
|
||||
prepare_tempest: false
|
||||
test_tempest: false
|
||||
test_ping: true
|
||||
|
@ -3,14 +3,24 @@
|
||||
|
||||
set -eux
|
||||
|
||||
{% if test_ping|bool %}
|
||||
TEST_PING={% if test_ping|bool %}1{% else %}0{% endif %}
|
||||
|
||||
PREPARE_TEMPEST={% if prepare_tempest|bool %}1{% else %}0{% endif %}
|
||||
|
||||
TEST_TEMPEST={% if test_tempest|bool %}1{% else %}0{% endif %}
|
||||
|
||||
|
||||
if [ ${TEST_PING} == "1" ]; then
|
||||
{% include 'tripleo-pingtest.sh.j2' %}
|
||||
{% endif %}
|
||||
|
||||
{% if prepare_tempest|bool %}
|
||||
fi
|
||||
|
||||
if [ ${PREPARE_TEMPEST} == "1" ]; then
|
||||
{% include 'configure-tempest.sh.j2' %}
|
||||
{% endif %}
|
||||
|
||||
{% if test_tempest|bool %}
|
||||
fi
|
||||
|
||||
if [ ${TEST_TEMPEST} == "1" ]; then
|
||||
{% include 'run-tempest.sh.j2' %}
|
||||
{% endif %}
|
||||
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user