openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Setting aodh_plugin to False in tempest"

This commit is contained in:
Jenkins 2017-06-23 14:09:30 +00:00 committed by Gerrit Code Review
parent a40b3d9e05 8d1d1df9fa
commit 162ccb2699
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/validate-tempest/templates/configure-tempest.sh.j2
View File

@ -131,6 +131,7 @@ export TEMPESTCONF="/usr/bin/discover-tempest-config"
cd {{ working_dir }}/tempest
# Generate Tempest Config file using python-tempestconf
# Notice aodh_plugin will be set to False if telemetry service is disabled
${TEMPESTCONF} --out etc/tempest.conf \
--network-id $public_net_id \
--deployer-input ~/{{ tempest_deployer_input_file }} \
@ -153,6 +154,9 @@ ${TEMPESTCONF} --out etc/tempest.conf \
validation.ssh_user cirros \
network.build_timeout 500 \
volume.build_timeout 500 \
{% if 'disable-telemetry.yaml' in telemetry_args|default('') %}
service_available.aodh_plugin False \
{% endif %}
orchestration.stack_owner_role heat_stack_owner
### --stop_docs