Commit 789b4564 authored by Tim Rozet's avatar Tim Rozet

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: default avatarTim Rozet <trozet@redhat.com>
parent b08e3323
...@@ -63,7 +63,7 @@ fi ...@@ -63,7 +63,7 @@ fi
cat << 'EOF' | sudo tee /etc/yum.repos.d/opendaylight.repo cat << 'EOF' | sudo tee /etc/yum.repos.d/opendaylight.repo
[opendaylight] [opendaylight]
name=OpenDaylight $releasever - $basearch 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 enabled=1
gpgcheck=0 gpgcheck=0
EOF EOF
...@@ -254,7 +254,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack- ...@@ -254,7 +254,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack-
# upload the opendaylight puppet module # upload the opendaylight puppet module
rm -rf puppet-opendaylight 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 pushd puppet-opendaylight
git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
popd popd
......
...@@ -409,6 +409,9 @@ function configure_deps { ...@@ -409,6 +409,9 @@ function configure_deps {
if [[ -z "$virtual" || "$virtual" == "FALSE" ]]; then if [[ -z "$virtual" || "$virtual" == "FALSE" ]]; then
# bridge interfaces to correct OVS instances for baremetal deployment # bridge interfaces to correct OVS instances for baremetal deployment
for network in ${enabled_network_list}; do for network in ${enabled_network_list}; do
if [[ "$network" != "admin_network" && "$network" != "public_network" ]]; then
continue
fi
this_interface=$(eval echo \${${network}_bridged_interface}) this_interface=$(eval echo \${${network}_bridged_interface})
# check if this a bridged interface for this network # check if this a bridged interface for this network
if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then if [[ ! -z "$this_interface" || "$this_interface" != "none" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment