Do not override DAEMON_ARGS through /etc/default files
After adding support we faced broken configuration for openstack
services (see related bug). OS services' init.d files "sources"
/etc/defaults/{service_name} files which could override DAEMON_ARGS.
Change-Id: Ia275e4b9acc0fe766691e95a172d71bff5d098bf
Related-bug: PROD-17968
diff --git a/neutron/files/default b/neutron/files/default
index be6a4c1..60df58e 100644
--- a/neutron/files/default
+++ b/neutron/files/default
@@ -1,4 +1,4 @@
# Generated by Salt.
{%- if values.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/neutron/logging/logging-{{ service_name }}.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/neutron/logging/logging-{{ service_name }}.conf"
{%- endif %}
diff --git a/neutron/files/mitaka/neutron-server b/neutron/files/mitaka/neutron-server
index 59f0305..ee68f08 100644
--- a/neutron/files/mitaka/neutron-server
+++ b/neutron/files/mitaka/neutron-server
@@ -16,5 +16,5 @@
{%- endif %}
{%- if server.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
{%- endif %}
diff --git a/neutron/files/newton/neutron-server b/neutron/files/newton/neutron-server
index 59f0305..ee68f08 100644
--- a/neutron/files/newton/neutron-server
+++ b/neutron/files/newton/neutron-server
@@ -16,5 +16,5 @@
{%- endif %}
{%- if server.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
{%- endif %}
diff --git a/neutron/files/ocata/neutron-server b/neutron/files/ocata/neutron-server
index 07fba29..b2e8978 100644
--- a/neutron/files/ocata/neutron-server
+++ b/neutron/files/ocata/neutron-server
@@ -16,5 +16,5 @@
{%- endif %}
{%- if server.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
{%- endif %}
diff --git a/neutron/files/pike/neutron-server b/neutron/files/pike/neutron-server
index 07fba29..b2e8978 100644
--- a/neutron/files/pike/neutron-server
+++ b/neutron/files/pike/neutron-server
@@ -16,5 +16,5 @@
{%- endif %}
{%- if server.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/neutron/logging/logging-neutron-server.conf"
{%- endif %}