diff options
| author | Chris Dent <chdent@redhat.com> | 2014-10-10 14:24:28 +0100 |
|---|---|---|
| committer | Chris Dent <chdent@redhat.com> | 2014-10-11 18:51:37 +0100 |
| commit | 0b76f2f0d2da2afb4df2a9c54c8a362621373d7c (patch) | |
| tree | 6e0089f59ae6179ec74a92a647bcc0f4f816d940 | |
| parent | 41d6aa233bf9c76734d443e023bb88a448f6ed59 (diff) | |
| download | tempest-0b76f2f0d2da2afb4df2a9c54c8a362621373d7c.tar.gz | |
Run telemetry in javelin if resources.yaml says so
In previous code telemetry checks were always run (if there
were servers to check). If the environment did not have ceilometer
services this would fail.
check_telemetry now checks that there is a true value on the
'telemetry' key in resources.yaml. No configuration is required for
the telemetry checks, so only a key with a value is required.
Change-Id: I84e0f5938ec808537043dba29a896f991779b04c
| -rwxr-xr-x | tempest/cmd/javelin.py | 2 | ||||
| -rw-r--r-- | tempest/cmd/resources.yaml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py index 3c41dd997..1aab14e22 100755 --- a/tempest/cmd/javelin.py +++ b/tempest/cmd/javelin.py @@ -282,6 +282,8 @@ class JavelinCheck(unittest.TestCase): If in check mode confirm that the oldest sample available is from before the upgrade. """ + if not self.res.get('telemetry'): + return LOG.info("checking telemetry") for server in self.res['servers']: client = client_for_user(server['owner']) diff --git a/tempest/cmd/resources.yaml b/tempest/cmd/resources.yaml index 19ee6d595..2d5e68687 100644 --- a/tempest/cmd/resources.yaml +++ b/tempest/cmd/resources.yaml @@ -57,3 +57,4 @@ objects: name: javelin1 owner: javelin file: /etc/hosts +telemetry: true |