summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-30 21:51:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-30 21:51:13 +0000
commit0b91edabf51d60968a20d605dd2b97f03283e06b (patch)
tree3bccbebfab1d562c71c3943a453f9f5ea1f444db /ci/deploy.sh
parent0d871d7ddce398bdfe0f18af5e2e1db4a6ac7b81 (diff)
parentd47d4a5ef7c78c3ca84450a2164ec63a5697e110 (diff)
Merge "Fixes nic template rendering"
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index abf3866b..9f678153 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -664,7 +664,7 @@ function configure_undercloud {
ovs_dpdk_bridge=''
fi
- if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -r controller -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then
+ if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -r controller -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e "br-ex" -af $ip_addr_family); then
echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}"
exit 1
fi