:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: : Copyright (c) 2018 Mirantis Inc., Enea AB and others. : : All rights reserved. This program and the accompanying materials : are made available under the terms of the Apache License, Version 2.0 : which accompanies this distribution, and is available at : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Michael Polenchuk Date: Tue, 6 Mar 2018 16:15:57 +0400 Subject: [PATCH] Disable root_helper_daemon option Change-Id: I4cc6cce4868ea95e806ce4b41069805fb995dcdb diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian index a94a24b..bec041f 100644 --- a/neutron/files/pike/neutron-generic.conf.Debian +++ b/neutron/files/pike/neutron-generic.conf.Debian @@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # needs to execute commands in Dom0 in the hypervisor of XenServer, this item # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session # to pass commands to Dom0. (string value) -root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf +#root_helper_daemon = # Seconds between nodes reporting state to server; should be less than # agent_down_time, best if it is half or less than agent_down_time. (floating diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian index 2daaebf..c9554c8 100644 --- a/neutron/files/pike/neutron-server.conf.Debian +++ b/neutron/files/pike/neutron-server.conf.Debian @@ -717,7 +717,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # needs to execute commands in Dom0 in the hypervisor of XenServer, this item # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session # to pass commands to Dom0. (string value) -root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf +#root_helper_daemon = # Seconds between nodes reporting state to server; should be less than # agent_down_time, best if it is half or less than agent_down_time. (floating