openstack/openstack-helm
Code Issues Proposed changes

Merge "Do not pass extra config files to neutron agents"

Browse Source
This commit is contained in:
Zuul 2020-09-14 22:06:07 +00:00 committed by Gerrit Code Review
commit 0abcd93fd9
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/templates/bin/_neutron-dhcp-agent.sh.tpl
View File

@ -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

7
neutron/templates/bin/_neutron-l3-agent.sh.tpl
View File

@ -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

7
neutron/templates/bin/_neutron-metadata-agent.sh.tpl
View File

@ -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

1
neutron/values.yaml
View File

@ -1875,6 +1875,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.