commit | ace8245db3ebb132ac8cb96bc39b9657b108d932 | [log] [tgz] |
---|---|---|
author | mcp-jenkins <mcp-jenkins@mirantis.com> | Fri Oct 26 09:21:58 2018 +0000 |
committer | Gerrit Code Review <mail@domain.com> | Fri Oct 26 09:21:58 2018 +0000 |
tree | 57143586d7819cfbf1c244a02fca7222d7708274 | |
parent | 8e75c9ac0bfdbcbc42337b886a6028ab01c798fd [diff] | |
parent | 71d9c66802819feed94b603c2aa935c4dfdc5463 [diff] |
Merge "Fix parameter vnc_server_header for multinode configuration"
diff --git a/_modules/runtest/tempest_sections/compute_feature_enabled.py b/_modules/runtest/tempest_sections/compute_feature_enabled.py index d2b3f9a..53a4404 100644 --- a/_modules/runtest/tempest_sections/compute_feature_enabled.py +++ b/_modules/runtest/tempest_sections/compute_feature_enabled.py
@@ -188,4 +188,6 @@ @property def vnc_server_header(self): - return 'nginx' + if conditions.BaseRule('*.nginx.server.enabled', 'eq', True, + multiple='any').check(self.pillar): + return 'nginx'