summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-06-17 14:55:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-17 14:55:18 +0000
commita1fe1a29a0e9f794395e4b31306a32cd7ec8cb44 (patch)
treeafd9be58bd36f2735748659aea5c4d1c6ac36c31 /ci
parent85759538077aad6e3c2e87ac7a6be5a2f1fb8803 (diff)
parent2a45bf8929c37396d789b1858bd32edf4de58e51 (diff)
Merge "Fixes nic templates for ovs dpdk"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 05e2fa2b..753245c3 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -648,12 +648,18 @@ function configure_undercloud {
ext_net_type=br-ex
fi
+ if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then
+ ovs_dpdk_bridge='br-phy'
+ else
+ ovs_dpdk_bridge=''
+ fi
+
if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -t $CONFIG/nics-controller.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then
echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}"
exit 1
fi
- if ! compute_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -t $CONFIG/nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then
+ if ! compute_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -t $CONFIG/nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then
echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}"
exit 1
fi