Install and start quagga/zrpcd
- compile and install zrpcd on the controller node using the compile script provided by upstream zrpcd - install a systemd file for zrpcd - start the service - increase the timeout for odl-install.pp to account for the compilation time Change-Id: Ia75cd9a2c9fa76ba128c943d373de4be96292e86 Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
This commit is contained in:
parent
207f862727
commit
c1be687a93
|
@ -5,3 +5,4 @@
|
||||||
.project
|
.project
|
||||||
.pydevproject
|
.pydevproject
|
||||||
tmp/
|
tmp/
|
||||||
|
deployment_scripts/install_quagga.sh
|
||||||
|
|
|
@ -6,3 +6,7 @@ class { 'opendaylight::install':
|
||||||
rest_port => $opendaylight::rest_api_port,
|
rest_port => $opendaylight::rest_api_port,
|
||||||
bind_address => $opendaylight::node_internal_address
|
bind_address => $opendaylight::node_internal_address
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class {'opendaylight::quagga':
|
||||||
|
before => Service['opendaylight']
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
class opendaylight::quagga (
|
class opendaylight::quagga (
|
||||||
){
|
){
|
||||||
|
$master_ip = hiera('master_ip')
|
||||||
|
|
||||||
firewall {'215 quagga':
|
firewall {'215 quagga':
|
||||||
dport => 179,
|
dport => 179,
|
||||||
|
@ -7,21 +8,22 @@ class opendaylight::quagga (
|
||||||
action => 'accept',
|
action => 'accept',
|
||||||
}
|
}
|
||||||
|
|
||||||
package { ['opnfv-quagga', 'libcapnp-0.5.99', 'python-pycapnp', 'python-thriftpy']:
|
$service_file = '/etc/systemd/system/zrpcd.service'
|
||||||
ensure => installed,
|
file { $service_file:
|
||||||
}
|
ensure => file,
|
||||||
service {'opnfv-quagga':
|
content => template('opendaylight/zrpcd.service'),
|
||||||
ensure => running
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$config_path = '/usr/lib/quagga/qthrift/bgpd.conf'
|
if $::operatingsystem == 'Ubuntu' {
|
||||||
ini_setting { 'bgp_password':
|
exec { 'install_quagga':
|
||||||
ensure => present,
|
command => "curl http://${master_ip}:8080/plugins/opendaylight-1.0/deployment_scripts/install_quagga.sh | bash -s",
|
||||||
setting => 'password',
|
path => '/usr/bin:/usr/sbin:/bin:/sbin',
|
||||||
value => 'sdncbgpc',
|
timeout => 0,
|
||||||
path => $config_path,
|
require => File[$service_file],
|
||||||
key_val_separator => ' ',
|
before => Service['zrpcd']
|
||||||
require => Package['opnfv-quagga'],
|
}
|
||||||
notify => Service['opnfv-quagga']
|
service {'zrpcd':
|
||||||
|
ensure => running
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
[Unit]
|
||||||
|
Description=ZRPC daemon for quagga
|
||||||
|
After=network.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/opt/quagga/sbin/zrpcd
|
||||||
|
Type=simple
|
||||||
|
PIDFile=/var/run/zrpcd.pid
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
|
@ -20,7 +20,7 @@
|
||||||
parameters:
|
parameters:
|
||||||
puppet_manifest: puppet/manifests/odl-install.pp
|
puppet_manifest: puppet/manifests/odl-install.pp
|
||||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||||
timeout: 720
|
timeout: 3000
|
||||||
|
|
||||||
# We remove override file, because 'odl_hiera_override' task is not reenterant and
|
# We remove override file, because 'odl_hiera_override' task is not reenterant and
|
||||||
# cannot correctly handled data on subsequent calls
|
# cannot correctly handled data on subsequent calls
|
||||||
|
|
|
@ -68,3 +68,11 @@ if ! in_cache $NETWORKING_ODL_DEB ;then
|
||||||
wget -O ${CACHE_DEB_DIR}/${NETWORKING_ODL_DEB} ${NETWORKING_ODL_REPO}/${NETWORKING_ODL_DEB}
|
wget -O ${CACHE_DEB_DIR}/${NETWORKING_ODL_DEB} ${NETWORKING_ODL_REPO}/${NETWORKING_ODL_DEB}
|
||||||
fi
|
fi
|
||||||
copy_from_cache $NETWORKING_ODL_DEB
|
copy_from_cache $NETWORKING_ODL_DEB
|
||||||
|
|
||||||
|
curl https://raw.githubusercontent.com/6wind/zrpcd/eddf5bd6305ef52a2d39df99860c734935dbc4af/pkgsrc/dev_compile_script.sh -o deployment_scripts/install_quagga.sh
|
||||||
|
# ubuntu 16.04 compatibility
|
||||||
|
sed -i 's/libboost1.55/libboost1.58/' deployment_scripts/install_quagga.sh
|
||||||
|
# pin the versions of things that the compile script downloads.
|
||||||
|
# These are the latest commits at the time this script was written.
|
||||||
|
sed -i 's/cd zrpcd/cd zrpcd \&\& git checkout eddf5bd6305ef52a2d39df99860c734935dbc4af/' deployment_scripts/install_quagga.sh
|
||||||
|
sed -i 's/quagga_110_mpbgp_capnp/95bb0f4a5/' deployment_scripts/install_quagga.sh
|
||||||
|
|
Loading…
Reference in New Issue