openstack
/
tripleo-image-elements
Code Issues Proposed changes

Remove redundancies between neutron-router and neutron-network-node 

This change removes the redundancies created by the introduction of the
neutron-router as part of enabling Neutron DVR support in tripleo. Now
rather than installing the l3-agent and metadata-agent as part of the
neutron-network-node element, the element instead has a dependency on
the neutron-router element which does the desired agent installations.

Change-Id: Ief61d028fa3b0674b44d8fb94f585209fd7dc635
blueprint: support-neutron-dvr
This commit is contained in:
Erik Colnick 2014-10-10 05:43:24 -06:00
parent c074ac902a
commit 5a70874e09
5 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/neutron-network-node/element-deps
View File

@ -1,6 +1,5 @@
neutron
neutron-dhcp-agent
neutron-openvswitch-agent
neutron-router
os-refresh-config
pacemaker
pkg-map

4
elements/neutron-network-node/install.d/neutron-source-install/80-arping
View File

@ -1,4 +0,0 @@
#!/bin/bash
set -eux
install-packages -m neutron-network-node arping_package

15
elements/neutron-network-node/install.d/neutron-source-install/80-neutron-networking
View File

@ -1,15 +0,0 @@
#!/bin/bash
set -eux
# If NEUTRON_VENV_DIR is set, then need to fix up the l3.filters rootwrap file to allow l3-agent to
# kill metadata-proxy processes when routers are deleted.
if [ -n "${NEUTRON_VENV_DIR}" ]
then
sed -i "s, /usr/bin/python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/l3.filters
fi
os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
# This has to be on the path of the agent that runs it http://pad.lv/1182704
ln -sf $NEUTRON_VENV_DIR/bin/neutron-ns-metadata-proxy /usr/bin

3
elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
View File

@ -1,9 +1,6 @@
#!/bin/bash
set -eux
os-svc-enable -n neutron-metadata-agent
os-svc-enable -n neutron-l3-agent
# this ensures that neutron-l3-agent and neutron-metadata-agent services
# will be monitored by pacemaker on all nodes.
# Because allow_automatic_l3agent_failover is enabled, we want

10
elements/neutron-network-node/pkg-map
View File

@ -1,10 +0,0 @@
{
"family": {
"debian": {
"arping_package": "iputils-arping"
}
},
"default": {
"arping_package": "iputils"
}
}