Make root_helper_daemon as an option
Give an ability to disable this option
if packages from UCA repository are used.
Change-Id: I4cc6cce4868ea95e806ce4b41069805fb995dcdb
diff --git a/README.rst b/README.rst
index 5532662..16a261d 100644
--- a/README.rst
+++ b/README.rst
@@ -26,6 +26,7 @@
api_workers: 2
rpc_workers: 2
rpc_state_report_workers: 2
+ root_helper_daemon: false
bind:
address: 172.20.0.1
port: 9696
diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian
index a94a24b..c7e4d64 100644
--- a/neutron/files/pike/neutron-generic.conf.Debian
+++ b/neutron/files/pike/neutron-generic.conf.Debian
@@ -668,7 +668,11 @@
# 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)
+{%- if neutron.root_helper_daemon|default(True) %}
root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
+{%- else %}
+#root_helper_daemon = <None>
+{%- endif %}
# 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..94443cf 100644
--- a/neutron/files/pike/neutron-server.conf.Debian
+++ b/neutron/files/pike/neutron-server.conf.Debian
@@ -717,7 +717,11 @@
# 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)
+{%- if neutron.root_helper_daemon|default(True) %}
root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
+{%- else %}
+#root_helper_daemon = <None>
+{%- endif %}
# 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