openstack/openstack-ansible
Code Issues Proposed changes

Automatically detect whether to test ceilometer/aodh

Browse Source 
This patch implements an automated determination of whether the
Telemetry systems should be tested by tempest based on whether
there are hosts in the applicable host groups.

This reduces the number of variables a deployer needs to set in
order to have a functional environment.

Change-Id: I74cf323237bcbb2ee91233ffc72044aa74eac59e
This commit is contained in:
Jesse Pretorius 2016-08-20 19:14:02 +01:00 committed by Kevin Carter (cloudnull)
parent 49e09bf973
commit b1483c82d5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/inventory/group_vars/utility_all.yml
View File

@ -24,6 +24,11 @@ galera_client_drop_config_file: true
# If cinder has a backup service enabled, make sure that Tempest tests it # If cinder has a backup service enabled, make sure that Tempest tests it
tempest_volume_backup_enabled: "{{ cinder_service_backup_program_enabled | bool }}" tempest_volume_backup_enabled: "{{ cinder_service_backup_program_enabled | bool }}"
# If there are Telemetry hosts in the environment, make sure that Tempest
# tests them
tempest_service_available_ceilometer: "{{ groups['ceilometer_all'] is defined and groups['ceilometer_all'] | length > 0 }}"
tempest_service_available_aodh: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}"
# Ensure that the package state matches the global setting # Ensure that the package state matches the global setting
utility_package_state: "{{ package_state }}" utility_package_state: "{{ package_state }}"

2
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -17,8 +17,6 @@
debug: True debug: True
## Tempest settings ## Tempest settings
tempest_service_available_ceilometer: True
tempest_service_available_aodh: True
tempest_public_subnet_cidr: 172.29.248.0/22 tempest_public_subnet_cidr: 172.29.248.0/22
tempest_public_subnet_allocation_pools: "172.29.249.110-172.29.249.200" tempest_public_subnet_allocation_pools: "172.29.249.110-172.29.249.200"