x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

enable full quagga support 

Change-Id: I4677008fdd51c041743e1d84862d6a893dccfc5e
This commit is contained in:
Nikolas Hermanns 2016-06-29 11:28:48 +02:00
parent 8eb70403e0
commit c78c601748
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
View File

@ -18,8 +18,9 @@ class opendaylight::install (
ensure => installed, ensure => installed,
} }
package {'opnfv-quagga': # quagga
ensure => installed, class { 'opendaylight::quagga':
before => Service['opendaylight']
} }
firewall {'215 odl': firewall {'215 odl':

19
deployment_scripts/puppet/modules/opendaylight/manifests/quagga.pp Normal file
View File

@ -0,0 +1,19 @@
class opendaylight::quagga (
){
package { ['opnfv-quagga', 'libcapnp-0.5.99', 'python-pycapnp', 'python-thriftpy']:
ensure => installed,
}
service {'opnfv-quagga':
ensure => running
}
$config_path = /usr/lib/quagga/qthrift/bgpd.conf
ini_setting { 'bgp_password':
ensure => present,
setting => 'password',
value => 'sdncbgpc',
path => $config_path,
require => Package['opnfv-quagga']
notify => Service['opnfv-quagga']
}
}

6
pre_build_hook
View File

@ -37,7 +37,7 @@ NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/mitaka}
#Opnfv-quagga-packaging #Opnfv-quagga-packaging
OPNFV_QUAGGE_PACKAGING_REPO=${OPNFV_QUAGGE_PACKAGING_REPO:-https://github.com/nikolas-hermanns/opnfv-quagga-packaging} OPNFV_QUAGGE_PACKAGING_REPO=${OPNFV_QUAGGE_PACKAGING_REPO:-https://github.com/nikolas-hermanns/opnfv-quagga-packaging}
OPNFV_QUAGGE_PACKAGING_BRANCH=stable/brahmaputra OPNFV_QUAGGE_PACKAGING_BRANCH=stable/colorado
# For which systems odl package should be build # For which systems odl package should be build
BUILD_FOR=${BUILD_FOR:-ubuntu} BUILD_FOR=${BUILD_FOR:-ubuntu}
@ -68,9 +68,9 @@ function add_opnfv_quagga {
git clone $OPNFV_QUAGGE_PACKAGING_REPO opnfv-quagga git clone $OPNFV_QUAGGE_PACKAGING_REPO opnfv-quagga
pushd opnfv-quagga pushd opnfv-quagga
git checkout $OPNFV_QUAGGE_PACKAGING_BRANCH git checkout $OPNFV_QUAGGE_PACKAGING_BRANCH
if [ ! -e debian_package/*.deb ];then if [ ! -e debian_package/ ];then
sudo apt-get -y install `cat requirements.txt` sudo apt-get -y install `cat requirements.txt`
make make -j6
fi fi
cp debian_package/* $path cp debian_package/* $path
popd popd