openstack/fuel-library
Code Issues Proposed changes

Merge "Fixing neutron-mlnx-agent service crash bug"

Browse Source
This commit is contained in:
Jenkins 2014-11-17 14:45:04 +00:00 committed by Gerrit Code Review
commit 8a0ceff907
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/mellanox_openstack/manifests/agent.pp
View File

@ -9,6 +9,7 @@ class mellanox_openstack::agent (
$filters_dir = $::mellanox_openstack::params::filters_dir $filters_dir = $::mellanox_openstack::params::filters_dir
$filters_file = $::mellanox_openstack::params::filters_file $filters_file = $::mellanox_openstack::params::filters_file
$compute_service_name = $::mellanox_openstack::params::compute_service_name $compute_service_name = $::mellanox_openstack::params::compute_service_name
$mlnx_agent_conf = $::mellanox_openstack::params::mlnx_agent_conf
# Only relevant for Debian since no package provides network.filters file # Only relevant for Debian since no package provides network.filters file
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
@ -34,6 +35,10 @@ class mellanox_openstack::agent (
Service[$compute_service_name] Service[$compute_service_name]
} }
file { $mlnx_agent_conf :
owner => 'neutron'
}
mellanox_agent_config { mellanox_agent_config {
'agent/rpc_support_old_agents' : value => true; 'agent/rpc_support_old_agents' : value => true;
'eswitch/physical_interface_mappings' : value => "${physnet}:${physifc}"; 'eswitch/physical_interface_mappings' : value => "${physnet}:${physifc}";
@ -51,6 +56,7 @@ class mellanox_openstack::agent (
} }
Package[$package] -> Package[$package] ->
File[$mlnx_agent_conf] ->
Mellanox_agent_config <||> ~> Mellanox_agent_config <||> ~>
Service[$agent] Service[$agent]

1
deployment/puppet/mellanox_openstack/manifests/params.pp
View File

@ -3,6 +3,7 @@ class mellanox_openstack::params {
$eswitchd_package = 'eswitchd' $eswitchd_package = 'eswitchd'
$filters_dir = '/etc/nova/rootwrap.d' $filters_dir = '/etc/nova/rootwrap.d'
$filters_file = "${filters_dir}/network.filters" $filters_file = "${filters_dir}/network.filters"
$mlnx_agent_conf = '/etc/neutron/plugins/mlnx/mlnx_conf.ini'
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {