From 789b4564d2530aa1f614981e5a346aa2c07ef11b Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 13 Jan 2016 16:40:03 -0500 Subject: Fixes attaching networks for baremetal only to admin/public We should only bridge to admin/public for baremetal deployments. There is no reason for us to bridge to the private or storage networks on instack for deployment. Also fixes OpenDaylight to Lithium 3.3 Change-Id: I2eb8f83ddbcb69d3219e7927025b46dcb9550ba9 Signed-off-by: Tim Rozet --- ci/deploy.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ci/deploy.sh') diff --git a/ci/deploy.sh b/ci/deploy.sh index 05df6406..21999d12 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -409,6 +409,9 @@ function configure_deps { if [[ -z "$virtual" || "$virtual" == "FALSE" ]]; then # bridge interfaces to correct OVS instances for baremetal deployment for network in ${enabled_network_list}; do + if [[ "$network" != "admin_network" && "$network" != "public_network" ]]; then + continue + fi this_interface=$(eval echo \${${network}_bridged_interface}) # check if this a bridged interface for this network if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then -- cgit 1.2.3-korg