diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-12 14:10:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 14:10:27 +0000 |
| commit | 3d7d28eb80b80bfd4795a28bb1d8e6fadacbdada (patch) | |
| tree | 11fcc9f4d869a8e3b97dfc5f8d081bc49bd94d29 /testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml | |
| parent | 5380c97d53cf7f198e75e9cd5531e758edbc76ff (diff) | |
| parent | 236f391ce99bc5e1d4a56ec5ea65705895bf39d9 (diff) | |
Merge "Rally test case troubleshooting"
Diffstat (limited to 'testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml')
| -rw-r--r-- | testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml b/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml index e6542f37a..48c0333e9 100644 --- a/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml +++ b/testcases/VIM/OpenStack/CI/rally_cert/macro/macro.yaml @@ -79,13 +79,15 @@ security_groups: -1 {%- endmacro %} -{%- macro unlimited_neutron() %} -{% if "neutron" in service_list %} +{%- macro unlimited_neutron(secgroups=false) %} neutron: network: -1 port: -1 subnet: -1 -{% endif %} + {%- if secgroups %} + security_group: -1 + security_group_rule: -1 + {%- endif %} {%- endmacro %} {%- macro glance_args(location, container="bare", type="qcow2") %} |