From 83d9d7b21d88e7e24ab6e5c949be11b82115661f Mon Sep 17 00:00:00 2001
From: Gil Meir <gilmeir@mellanox.com>
Date: Sun, 9 Nov 2014 13:25:16 +0200
Subject: [PATCH] Fixing neutron-mlnx-agent service crash bug

Incorrect permissions for mlnx_conf.ini made the service crash.
The fix sets the owner as 'neutron' since the service is being run as neutron user.

Closes-bug: #1390185
Change-Id: Ieb0927d644c5a1d7eead12a32580f88d4d790e43
Signed-off-by: Gil Meir <gilmeir@mellanox.com>
---
 deployment/puppet/mellanox_openstack/manifests/agent.pp  | 6 ++++++
 deployment/puppet/mellanox_openstack/manifests/params.pp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/deployment/puppet/mellanox_openstack/manifests/agent.pp b/deployment/puppet/mellanox_openstack/manifests/agent.pp
index 4960ffa09e..e2a1f00446 100644
--- a/deployment/puppet/mellanox_openstack/manifests/agent.pp
+++ b/deployment/puppet/mellanox_openstack/manifests/agent.pp
@@ -9,6 +9,7 @@ class mellanox_openstack::agent (
     $filters_dir          = $::mellanox_openstack::params::filters_dir
     $filters_file         = $::mellanox_openstack::params::filters_file
     $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
     if $::osfamily == 'Debian' {
@@ -34,6 +35,10 @@ class mellanox_openstack::agent (
         Service[$compute_service_name]
     }
 
+    file { $mlnx_agent_conf :
+        owner => 'neutron'
+    }
+
     mellanox_agent_config {
         'agent/rpc_support_old_agents'        : value => true;
         'eswitch/physical_interface_mappings' : value => "${physnet}:${physifc}";
@@ -51,6 +56,7 @@ class mellanox_openstack::agent (
     }
 
     Package[$package] ->
+    File[$mlnx_agent_conf] ->
     Mellanox_agent_config <||> ~>
     Service[$agent]
 
diff --git a/deployment/puppet/mellanox_openstack/manifests/params.pp b/deployment/puppet/mellanox_openstack/manifests/params.pp
index 695c316c2b..a9594e54a2 100644
--- a/deployment/puppet/mellanox_openstack/manifests/params.pp
+++ b/deployment/puppet/mellanox_openstack/manifests/params.pp
@@ -3,6 +3,7 @@ class mellanox_openstack::params {
   $eswitchd_package          = 'eswitchd'
   $filters_dir               = '/etc/nova/rootwrap.d'
   $filters_file              = "${filters_dir}/network.filters"
+  $mlnx_agent_conf           = '/etc/neutron/plugins/mlnx/mlnx_conf.ini'
 
   case $::osfamily {
     'RedHat': {