Move rootwrap filters into etc/
This is needed to include the filters file in the sdist tarball when doing releases with "python setup.py sdist". Change-Id: I3670273f3630a8fd5c0b16f594940c39f98f06df Closes-Bug: #1653620
This commit is contained in:
@@ -6,6 +6,7 @@ include TESTING.rst
|
||||
include requirements.txt
|
||||
include test-requirements.txt
|
||||
include etc/policy.json
|
||||
include etc/midonet_rootwrap.filters
|
||||
include midonet/neutron/db/migration/alembic.ini
|
||||
include midonet/neutron/db/migration/alembic_migration/README
|
||||
include midonet/neutron/db/migration/alembic_migration/script.py.mako
|
||||
|
||||
@@ -11,14 +11,14 @@ function neutron_plugin_configure_common {
|
||||
Q_PLUGIN_CONF_FILENAME=midonet.ini
|
||||
Q_PLUGIN_CLASS=${MIDONET_PLUGIN}
|
||||
|
||||
cd ${PLUGIN_PATH}
|
||||
cd ${NETWORKING_MIDONET_DIR}
|
||||
mkdir -p etc/midonet
|
||||
oslo-config-generator --output-file etc/midonet/midonet.ini.v2.sample \
|
||||
--namespace midonet_v2
|
||||
cd -
|
||||
mkdir -p /${Q_PLUGIN_CONF_PATH}
|
||||
conf_file=midonet.ini.v2.sample
|
||||
cp ${PLUGIN_PATH}/etc/midonet/${conf_file} \
|
||||
cp ${NETWORKING_MIDONET_DIR}/etc/midonet/${conf_file} \
|
||||
/${Q_PLUGIN_CONF_PATH}/${Q_PLUGIN_CONF_FILENAME}
|
||||
}
|
||||
|
||||
|
||||
@@ -50,13 +50,10 @@ if [[ "$1" == "stack" ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clone and build neutron midonet plugin
|
||||
PLUGIN_PATH=$ABSOLUTE_PATH/..
|
||||
|
||||
elif [[ "$2" == "install" ]]; then
|
||||
|
||||
# Build neutron midonet plugin
|
||||
pip_install --no-deps --editable $PLUGIN_PATH
|
||||
pip_install --no-deps --editable $NETWORKING_MIDONET_DIR
|
||||
if [ "$MIDONET_USE_PACKAGE" != "True" ]; then
|
||||
# Build midonet client
|
||||
pip_install --editable $MIDONET_DIR/python-midonetclient
|
||||
@@ -148,13 +145,13 @@ if [[ "$1" == "stack" ]]; then
|
||||
echo cluster.loggers.root: DEBUG|mn-conf set
|
||||
fi
|
||||
|
||||
# Set rootwrap.d to installed mm-ctl filters
|
||||
sudo cp $ABSOLUTE_PATH/midonet_rootwrap.filters /etc/neutron/rootwrap.d/
|
||||
# copy needed neutron config (eg rootwrap filters)
|
||||
sudo cp $NETWORKING_MIDONET_DIR/etc/midonet_rootwrap.filters /etc/neutron/rootwrap.d/
|
||||
|
||||
neutron-db-manage --subproject networking-midonet upgrade head
|
||||
|
||||
if is_service_enabled nova; then
|
||||
sudo cp $ABSOLUTE_PATH/midonet_rootwrap.filters /etc/nova/rootwrap.d/
|
||||
sudo cp $NETWORKING_MIDONET_DIR/etc/midonet_rootwrap.filters /etc/nova/rootwrap.d/
|
||||
|
||||
# Hack libvirt qemu conf to allow ethernet mode to run
|
||||
export LIBVIRT_QEMU_CONF='/etc/libvirt/qemu.conf'
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
NETWORKING_MIDONET_DIR=${NETWORKING_MIDONET_DIR:=$DEST/networking-midonet}
|
||||
|
||||
# lib/neutron vs lib/neutron-legacy compat
|
||||
Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user