echo "Number of Control nodes found: ${NUM_CONTROL_NODES}"
echo "Number of Compute nodes found: ${NUM_COMPUTE_NODES}"
+if [ "$NUM_COMPUTE_NODES" -eq 0 ]; then
+ OPENSTACK_TOPO="${NUM_CONTROL_NODES}cmb-0ctl-0cmp"
+else
+ OPENSTACK_TOPO="0cmb-${NUM_CONTROL_NODES}ctl-${NUM_COMPUTE_NODES}cmp"
+fi
+
idx=1
EXTRA_ROBOT_ARGS=""
for idx in `seq 1 $NUM_CONTROL_NODES`; do
-v HA_PROXY_${idx}_IP:${SDN_CONTROLLER_IP}"
done
-idx=1
-for idx in `seq 1 $NUM_COMPUTE_NODES`; do
- COMPUTE_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH)
- EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_${idx}_IP:${COMPUTE_IP}"
-done
+# In all-in-one these Compute IPs still need to be passed to robot
+if [ "$NUM_COMPUTE_NODES" -eq 0 ]; then
+ EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_1_IP:'' -v OS_COMPUTE_2_IP:''"
+else
+ idx=1
+ for idx in `seq 1 $NUM_COMPUTE_NODES`; do
+ COMPUTE_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH)
+ EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_${idx}_IP:${COMPUTE_IP}"
+ done
+fi
CONTROLLER_1_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH)
-v NODE_STOP_COMMAND:'sudo systemctl stop opendaylight_api' \
-v NODE_FREEZE_COMMAND:'sudo systemctl stop opendaylight_api' "
else
- EXTRA_ROBOT_ARGS+=" -v NODE_KARAF_COUNT_COMMAND:\"sudo docker exec opendaylight_api /bin/bash -c 'ps axf | \
- grep org.apache.karaf | grep -v grep | wc -l' || echo 0\" \
- -v NODE_START_COMMAND:\"sudo docker start opendaylight_api\" \
- -v NODE_KILL_COMMAND:\"sudo docker stop opendaylight_api\" \
- -v NODE_STOP_COMMAND:\"sudo docker stop opendaylight_api\" \
- -v NODE_FREEZE_COMMAND:\"sudo docker stop opendaylight_api\" "
+ EXTRA_ROBOT_ARGS+=" -v NODE_KARAF_COUNT_COMMAND:'sudo docker ps | grep opendaylight_api | wc -l || echo 0' \
+ -v NODE_START_COMMAND:'sudo docker start opendaylight_api' \
+ -v NODE_KILL_COMMAND:'sudo docker stop opendaylight_api' \
+ -v NODE_STOP_COMMAND:'sudo docker stop opendaylight_api' \
+ -v NODE_FREEZE_COMMAND:'sudo docker stop opendaylight_api' "
fi
# FIXME(trozet) remove this once it is fixed in csit
-v ODL_SYSTEM_IP:$CONTROLLER_1_IP \
-v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \
-v OPENSTACK_BRANCH:$FULL_OS_VER \
- -v OPENSTACK_TOPO:"0cmb-1ctl-2cmp" \
+ -v OPENSTACK_TOPO:$OPENSTACK_TOPO \
-v OS_USER:heat-admin \
-v ODL_ENABLE_L3_FWD:yes \
-v ODL_SYSTEM_USER:heat-admin \