[Neutron] ovn adopt uwsgi
As [1] fixed and [2] introduced, we should use uwsgi for Neutron server with OVN backend now. [1] https://bugs.launchpad.net/neutron/+bug/1912359 [2] https://bugs.launchpad.net/neutron/+bug/2087953 Change-Id: I81ef7571afafaf6dedcdc2df534bd44d891c4803 Signed-off-by: ricolin <rlin@vexxhost.com>
This commit is contained in:
@@ -18,42 +18,32 @@ set -ex
|
|||||||
COMMAND="${@:-start}"
|
COMMAND="${@:-start}"
|
||||||
|
|
||||||
function start () {
|
function start () {
|
||||||
# (ricolin): Currently ovn have issue with uWSGI,
|
confs="--config-file /etc/neutron/neutron.conf"
|
||||||
# let's keep using non-uWSGI way until this bug fixed:
|
|
||||||
# https://bugs.launchpad.net/neutron/+bug/1912359
|
|
||||||
{{- if ( has "ovn" .Values.network.backend ) }}
|
{{- if ( has "ovn" .Values.network.backend ) }}
|
||||||
start_ovn
|
confs+=" --config-file /tmp/pod-shared/ovn.ini"
|
||||||
{{- else }}
|
|
||||||
exec uwsgi --ini /etc/neutron/neutron-api-uwsgi.ini
|
|
||||||
{{- end }}
|
|
||||||
}
|
|
||||||
|
|
||||||
function start_ovn () {
|
|
||||||
exec neutron-server \
|
|
||||||
--config-file /etc/neutron/neutron.conf \
|
|
||||||
{{- if ( has "ovn" .Values.network.backend ) }}
|
|
||||||
--config-file /tmp/pod-shared/ovn.ini \
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if contains "vpnaas" .Values.conf.neutron.DEFAULT.service_plugins }}
|
{{- if contains "vpnaas" .Values.conf.neutron.DEFAULT.service_plugins }}
|
||||||
--config-file /etc/neutron/neutron_vpnaas.conf \
|
confs+=" --config-file /etc/neutron/neutron_vpnaas.conf"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if contains "ovn-vpnaas" .Values.conf.neutron.DEFAULT.service_plugins }}
|
{{- if contains "ovn-vpnaas" .Values.conf.neutron.DEFAULT.service_plugins }}
|
||||||
--config-file /etc/neutron/neutron_ovn_vpn_agent.ini \
|
confs+=" --config-file /etc/neutron/neutron_ovn_vpn_agent.ini"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.conf.plugins.taas.taas.enabled }}
|
{{- if .Values.conf.plugins.taas.taas.enabled }}
|
||||||
--config-file /etc/neutron/taas_plugin.ini \
|
confs+=" --config-file /etc/neutron/taas_plugin.ini"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if ( has "sriov" .Values.network.backend ) }}
|
{{- if ( has "sriov" .Values.network.backend ) }}
|
||||||
--config-file /etc/neutron/plugins/ml2/sriov_agent.ini \
|
confs+=" --config-file /etc/neutron/plugins/ml2/sriov_agent.ini"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.conf.plugins.l2gateway }}
|
{{- if .Values.conf.plugins.l2gateway }}
|
||||||
--config-file /etc/neutron/l2gw_plugin.ini \
|
confs+=" --config-file /etc/neutron/l2gw_plugin.ini"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if ( has "tungstenfabric" .Values.network.backend ) }}
|
{{- if ( has "tungstenfabric" .Values.network.backend ) }}
|
||||||
--config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini
|
confs+=" --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini"
|
||||||
{{- else }}
|
{{- else }}
|
||||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini
|
confs+=" --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
exec uwsgi --ini /etc/neutron/neutron-api-uwsgi.ini --pyargv " $confs "
|
||||||
}
|
}
|
||||||
|
|
||||||
function stop () {
|
function stop () {
|
||||||
|
14
releasenotes/notes/neutron-3c33aea435f7ab8a.yaml
Normal file
14
releasenotes/notes/neutron-3c33aea435f7ab8a.yaml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
---
|
||||||
|
# To create a new release note related to a specific chart:
|
||||||
|
# reno new <chart_name>
|
||||||
|
#
|
||||||
|
# To create a new release note for a common change (when multiple charts
|
||||||
|
# are changed):
|
||||||
|
# reno new common
|
||||||
|
neutron:
|
||||||
|
- |
|
||||||
|
Neutron OVN now runs under **uWSGI**, and the legacy **eventlet** support
|
||||||
|
has been removed. The ``neutron-server`` binary is no longer provided.
|
||||||
|
Updated configuration references to reflect the switch to uWSGI
|
||||||
|
for Neutron OVN.
|
||||||
|
...
|
Reference in New Issue
Block a user