From 75472fc85649dd243703252cc53b81f9c8e9ddec Mon Sep 17 00:00:00 2001
From: Ann Taraday <akamyshnikova@mirantis.com>
Date: Fri, 3 Jul 2020 16:55:25 +0400
Subject: [PATCH] Do not pass extra config files to neutron agents

Passing config files from other agents result in
incorrent loading of extensions.

Value metadata_proxy_socket should be set in neutron.conf

Change-Id: If22168ccc77c918f7cfcb5d9d0d548f02d2a09e9
---
 neutron/templates/bin/_neutron-dhcp-agent.sh.tpl     | 7 +------
 neutron/templates/bin/_neutron-l3-agent.sh.tpl       | 7 +------
 neutron/templates/bin/_neutron-metadata-agent.sh.tpl | 7 ++-----
 neutron/values.yaml                                  | 1 +
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl b/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl
index 1175a8d2a3..1e1eaa1844 100644
--- a/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl
@@ -17,12 +17,7 @@ limitations under the License.
 set -x
 exec neutron-dhcp-agent \
       --config-file /etc/neutron/neutron.conf \
-      --config-file /etc/neutron/dhcp_agent.ini \
-      --config-file /etc/neutron/metadata_agent.ini \
 {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
   --config-file /tmp/pod-shared/neutron-agent.ini \
 {{- end }}
-{{- if ( has "openvswitch" .Values.network.backend ) }}
-      --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
-{{- end }}
-      --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
+      --config-file /etc/neutron/dhcp_agent.ini
diff --git a/neutron/templates/bin/_neutron-l3-agent.sh.tpl b/neutron/templates/bin/_neutron-l3-agent.sh.tpl
index e239bc334c..2b642553fe 100644
--- a/neutron/templates/bin/_neutron-l3-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-l3-agent.sh.tpl
@@ -18,12 +18,7 @@ set -x
 
 exec neutron-l3-agent \
       --config-file /etc/neutron/neutron.conf \
-      --config-file /etc/neutron/l3_agent.ini \
-      --config-file /etc/neutron/metadata_agent.ini \
 {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
   --config-file /tmp/pod-shared/neutron-agent.ini \
 {{- end }}
-{{- if ( has "openvswitch" .Values.network.backend ) }}
-      --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
-{{- end }}
-      --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
+      --config-file /etc/neutron/l3_agent.ini
diff --git a/neutron/templates/bin/_neutron-metadata-agent.sh.tpl b/neutron/templates/bin/_neutron-metadata-agent.sh.tpl
index f79d62dc7f..f93d169f0f 100644
--- a/neutron/templates/bin/_neutron-metadata-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-metadata-agent.sh.tpl
@@ -17,11 +17,8 @@ limitations under the License.
 set -x
 exec neutron-metadata-agent \
       --config-file /etc/neutron/neutron.conf \
-      --config-file /etc/neutron/metadata_agent.ini \
 {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
   --config-file /tmp/pod-shared/neutron-agent.ini \
 {{- end }}
-{{- if ( has "openvswitch" .Values.network.backend ) }}
-      --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \
-{{- end }}
-      --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
+      --config-file /etc/neutron/metadata_agent.ini
+
diff --git a/neutron/values.yaml b/neutron/values.yaml
index f2f7e52ac7..f9bd148d6f 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1868,6 +1868,7 @@ conf:
         sh: CommandFilter, sh, root
   neutron:
     DEFAULT:
+      metadata_proxy_socket: /var/lib/neutron/openstack-helm/metadata_proxy
       log_config_append: /etc/neutron/logging.conf
       # NOTE(portdirect): the bind port should not be defined, and is manipulated
       # via the endpoints section.