From 428f736b81286e06a0d8cf44544a052acd66d15b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 19 Sep 2024 18:31:19 +0900
Subject: [PATCH] Load core neutron.conf in ovn-vpn-agent

The agent requires oslo_messaging options configured to connect to
message queues such as RabbitMQ. Load the neutron.conf which contain
these options.

Change-Id: I9e9e1d90e62739b6accf67d427557aad76521750
---
 devstack/plugin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 588781568..628b3bf51 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -104,7 +104,7 @@ function neutron_vpnaas_start_vpnagent {
     NEUTRON_OVN_BIN_DIR=$(get_python_exec_prefix)
     NEUTRON_OVN_VPNAGENT_BINARY="neutron-ovn-vpn-agent"
 
-    run_process q-ovn-vpn-agent "$NEUTRON_OVN_BIN_DIR/$NEUTRON_OVN_VPNAGENT_BINARY --config-file $OVN_VPNAGENT_CONF"
+    run_process q-ovn-vpn-agent "$NEUTRON_OVN_BIN_DIR/$NEUTRON_OVN_VPNAGENT_BINARY --config-file $NEUTRON_CONF --config-file $OVN_VPNAGENT_CONF"
     # Format logging
     setup_logging $OVN_VPNAGENT_CONF
 }