diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-16 11:01:41 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-08-16 11:18:42 -0400 |
| commit | 3aa4ff2ae4db3bbfdd139927c0cf0d09a5fdca6a (patch) | |
| tree | 51616bf3fa037fcff09b3ad1e5c5fce14f7bfc01 | |
| parent | 78bfef0da4d7bf632b630b1815725efef14f94f7 (diff) | |
CPERF: CSIT hardcode OPENSTACK_TOPO
CSIT has static topologies that it supports, so even if we
have more nodes we need to conform to the CSIT input.
Change-Id: Id8647afaccbbf145dbf938b097ac49b92ce876f8
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 0895ab624..d3a8cd99a 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -33,10 +33,15 @@ NUM_COMPUTE_NODES=$(python ${REL_PATH}/parse-node-yaml.py num_nodes --node-type echo "Number of Control nodes found: ${NUM_CONTROL_NODES}" echo "Number of Compute nodes found: ${NUM_COMPUTE_NODES}" +# Only 1 combo or ctrl node is specified, even for OS HA deployments +# Currently supported combinations are: +# 0cmb-1ctl-2cmp +# 1cmb-0ctl-0cmp +# 1cmb-0ctl-1cmp if [ "$NUM_COMPUTE_NODES" -eq 0 ]; then - OPENSTACK_TOPO="${NUM_CONTROL_NODES}cmb-0ctl-0cmp" + OPENSTACK_TOPO="1cmb-0ctl-0cmp" else - OPENSTACK_TOPO="0cmb-${NUM_CONTROL_NODES}ctl-${NUM_COMPUTE_NODES}cmp" + OPENSTACK_TOPO="0cmb-1ctl-2cmp" fi idx=1 |