Installing same ovs version on the controller
In order to use ODL Boron with the OPNFV SDNVPN features, a newer version of ovs is required in the controller node, otherwise the DHCP does not work. Also, it does not make sense to have 2 different ovs versions in one deployment. Change-Id: I454a9e6e577bca65a8ac54a55b44cc40b7f238fa
This commit is contained in:
parent
996c928d42
commit
0591813082
@ -1,17 +0,0 @@
|
|||||||
# get options
|
|
||||||
$master_ip = hiera('master_ip')
|
|
||||||
$ovs_settings = hiera('fuel-plugin-ovs')
|
|
||||||
$dpdk = hiera_hash('dpdk', {})
|
|
||||||
|
|
||||||
$install_nsh = $ovs_settings['install_nsh']
|
|
||||||
$install_dpdk = $ovs_settings['install_dpdk']
|
|
||||||
$ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
|
|
||||||
|
|
||||||
|
|
||||||
if $operatingsystem == 'Ubuntu' {
|
|
||||||
exec { 'install ovs_nsh_dpdk':
|
|
||||||
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
|
|
||||||
path => "/usr/bin:/usr/sbin:/bin:/sbin",
|
|
||||||
}
|
|
||||||
} elsif $operatingsystem == 'CentOS' {
|
|
||||||
}
|
|
21
deployment_scripts/puppet/manifests/ovs-install.pp
Normal file
21
deployment_scripts/puppet/manifests/ovs-install.pp
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
notice('MODULAR: ovs-install.pp')
|
||||||
|
# get options
|
||||||
|
$master_ip = hiera('master_ip')
|
||||||
|
$ovs_settings = hiera('fuel-plugin-ovs')
|
||||||
|
$dpdk = hiera_hash('dpdk', {})
|
||||||
|
|
||||||
|
$install_nsh = $ovs_settings['install_nsh']
|
||||||
|
$install_dpdk = $ovs_settings['install_dpdk']
|
||||||
|
$install_on_controller = $ovs_settings['install_on_controller']
|
||||||
|
$ovs_socket_mem = join(pick($dpdk['ovs_socket_mem'], []), ',')
|
||||||
|
|
||||||
|
|
||||||
|
if $operatingsystem == 'Ubuntu' {
|
||||||
|
if (!roles_include(['primary-controller', 'controller'])) or ($install_on_controller == 'true') {
|
||||||
|
exec { 'install ovs_nsh_dpdk':
|
||||||
|
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk} ${ovs_socket_mem}",
|
||||||
|
path => "/usr/bin:/usr/sbin:/bin:/sbin",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} elsif $operatingsystem == 'CentOS' {
|
||||||
|
}
|
@ -1,13 +1,13 @@
|
|||||||
- id: ovs_install_compute
|
- id: ovs_install
|
||||||
type: puppet
|
type: puppet
|
||||||
version: 2.1.0
|
version: 2.1.0
|
||||||
groups: [compute]
|
groups: [compute, primary-controller, controller]
|
||||||
requires: [allocate_hugepages]
|
requires: [allocate_hugepages]
|
||||||
required_for: [netconfig]
|
required_for: [netconfig]
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: changedAny($.get('fuel-plugin-ovs'), $.get('dpdk'))
|
yaql_exp: changedAny($.get('fuel-plugin-ovs'), $.get('dpdk'))
|
||||||
parameters:
|
parameters:
|
||||||
puppet_manifest: puppet/manifests/ovs-install-compute.pp
|
puppet_manifest: puppet/manifests/ovs-install.pp
|
||||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||||
timeout: 720
|
timeout: 720
|
||||||
|
|
||||||
|
@ -9,3 +9,8 @@ attributes:
|
|||||||
weight: 20
|
weight: 20
|
||||||
value: false
|
value: false
|
||||||
label: "Install NSH"
|
label: "Install NSH"
|
||||||
|
install_on_controller:
|
||||||
|
type: "checkbox"
|
||||||
|
weight: 20
|
||||||
|
value: false
|
||||||
|
label: "Install same OVS version on the Controller"
|
||||||
|
Loading…
Reference in New Issue
Block a user