openstack/kolla-ansible
Code Issues Proposed changes

The Neutron agents need their configuration directory specified

Browse Source 
Add a --config-dir specification to each agent run.

Change-Id: I0426caf2ca17185c0789753d4aa9637c5b4327ec
Partially-Implements: blueprint port-kilo
This commit is contained in:
Steven Dake 2015-05-02 09:20:33 -07:00
parent dd06c2347b
commit 4942e642cf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-agents/config-scripts/config-dhcp-agent.sh
View File

@ -83,4 +83,4 @@ ip netns list | grep qdhcp | while read -r line ; do
done
# Start DHCP Agent
exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini
exec /usr/bin/neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron

2
docker/neutron/neutron-agents/config-scripts/config-l3-agent.sh
View File

@ -82,4 +82,4 @@ ip netns list | grep qrouter | while read -r line ; do
done
# Start L3 Agent
exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini
exec /usr/bin/neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-dir /etc/neutron

2
docker/neutron/neutron-agents/config-scripts/config-linuxbridge-agent.sh
View File

@ -26,4 +26,4 @@ crudini --set $cfg \
physical_interface_mappings \
"${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}"
exec /usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
exec /usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron

2
docker/neutron/neutron-agents/config-scripts/config-metadata-agent.sh
View File

@ -71,4 +71,4 @@ crudini --set $cfg \
"${NEUTRON_SHARED_SECRET}"
# Start Metadata Agent
exec /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini
exec /usr/bin/neutron-metadata-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron