summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-13 16:40:03 -0500
committerTim Rozet <trozet@redhat.com>2016-01-13 22:03:27 -0500
commit789b4564d2530aa1f614981e5a346aa2c07ef11b (patch)
tree44b760c8ccc1ba74bed5c2cca246b1325a4c78b0
parentb08e3323c00bf216730ed44c729562ffa1f57ac9 (diff)
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 <trozet@redhat.com>
-rwxr-xr-xbuild/instack.sh4
-rwxr-xr-xci/deploy.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 54f05d54..92ef5e80 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -63,7 +63,7 @@ fi
cat << 'EOF' | sudo tee /etc/yum.repos.d/opendaylight.repo
[opendaylight]
name=OpenDaylight $releasever - $basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-33-release/$basearch/os/
enabled=1
gpgcheck=0
EOF
@@ -254,7 +254,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack-
# upload the opendaylight puppet module
rm -rf puppet-opendaylight
-git clone https://github.com/dfarrell07/puppet-opendaylight
+git clone -b 2.2.0 https://github.com/dfarrell07/puppet-opendaylight
pushd puppet-opendaylight
git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
popd
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