openstack/devstack
Code Issues Proposed changes

lib/neutron: Prepare for move of api-paste, rootwrap conf

Browse Source 
Change-Id: I70ba357f9af668fb7a7cb737d13fe24e572eb0ff
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-09-15 12:54:09 +01:00
parent 6eabfa32c8
commit f72801c108
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/neutron
View File

@@ -996,7 +996,13 @@ function _configure_neutron_plugin_agent {
# It is called when q-svc is enabled. # It is called when q-svc is enabled.
function _configure_neutron_service { function _configure_neutron_service {
Q_API_PASTE_FILE=$NEUTRON_CONF_DIR/api-paste.ini Q_API_PASTE_FILE=$NEUTRON_CONF_DIR/api-paste.ini
cp $NEUTRON_DIR/etc/api-paste.ini $Q_API_PASTE_FILE if test -r $NEUTRON_DIR/etc/neutron/api-paste.ini; then
cp $NEUTRON_DIR/etc/neutron/api-paste.ini $Q_API_PASTE_FILE
else
# TODO(stephenfin): Remove this branch once [1] merges
# [1] https://review.opendev.org/c/openstack/neutron/+/961130
cp $NEUTRON_DIR/etc/api-paste.ini $Q_API_PASTE_FILE
fi
# Update either configuration file with plugin # Update either configuration file with plugin
iniset $NEUTRON_CONF DEFAULT core_plugin $Q_PLUGIN_CLASS iniset $NEUTRON_CONF DEFAULT core_plugin $Q_PLUGIN_CLASS
@@ -1076,6 +1082,8 @@ function _neutron_setup_rootwrap {
if test -r $NEUTRON_DIR/etc/neutron/rootwrap.conf; then if test -r $NEUTRON_DIR/etc/neutron/rootwrap.conf; then
sudo install -o root -g root -m 644 $NEUTRON_DIR/etc/neutron/rootwrap.conf $Q_RR_CONF_FILE sudo install -o root -g root -m 644 $NEUTRON_DIR/etc/neutron/rootwrap.conf $Q_RR_CONF_FILE
else else
# TODO(stephenfin): Remove this branch once [1] merges
# [1] https://review.opendev.org/c/openstack/neutron/+/961130
sudo install -o root -g root -m 644 $NEUTRON_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE sudo install -o root -g root -m 644 $NEUTRON_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE
fi fi
sudo sed -e "s:^filters_path=.*$:filters_path=$Q_CONF_ROOTWRAP_D:" -i $Q_RR_CONF_FILE sudo sed -e "s:^filters_path=.*$:filters_path=$Q_CONF_ROOTWRAP_D:" -i $Q_RR_CONF_FILE