Use computes + control for NUM_OS_SYSTEM

This is not going to work when we want to make our HA
CSIT work, since I think Apex will be having 3
openstack control nodes, and our CSIT won't know what
to do with '5' (3 control + 2 compute) openstack
nodes. But, we can cross that bridge when we get
there.

Change-Id: I9c74b2ec73e5af0039d93f9ed812fc3c100a3e4a
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 9abb4ad..4ed8595 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -87,7 +87,7 @@ robot_cmd="pybot \
   -v DEVSTACK_DEPLOY_PATH:/tmp \
   -v HA_PROXY_IP:$SDN_CONTROLLER_IP \
   -v NUM_ODL_SYSTEM:$NUM_CONTROL_NODES \
-  -v NUM_OS_SYSTEM:$NUM_CONTROL_NODES \
+  -v NUM_OS_SYSTEM:$(($NUM_CONTROL_NODES + $NUM_COMPUTE_NODES)) \
   -v NUM_TOOLS_SYSTEM:0 \
   -v ODL_SNAT_MODE:conntrack \
   -v ODL_STREAM:$ODL_STREAM \