openstack
/
tripleo-image-elements
Code Issues Proposed changes

Split neutron-dhcp-agent into it's own element. 

For undercloud control planes we need the Neutron DHCP agent but not
the L3 agent or metadata agent (at this point anyhow). Without the
DHCP agent we can't start using the Neutron integrated DHCP PXE
booting facility, which is a prerequisite for disabling file
injection.

Change-Id: I46fe856009472aedebba1b1d5a3ad9698ff6d29b
This commit is contained in:
Robert Collins 2013-09-18 17:49:06 +12:00
parent 6bafd70ca2
commit 462002cf3c
7 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/neutron-dhcp-agent/README.md Normal file
View File

@ -0,0 +1,7 @@
Install the Neutron DHCP agent.
Configuration
-------------
No DHCP specific configuration exists. See the neutron-openvswitch-agent
element for configuration parameters.

3
elements/neutron-dhcp-agent/element-deps Normal file
View File

@ -0,0 +1,3 @@
neutron
neutron-openvswitch-agent
os-refresh-config

4
elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -eux
os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron

4
elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -eux
service neutron-dhcp-agent restart

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

@ -1,2 +1,4 @@
neutron
neutron-dhcp-agent
neutron-openvswitch-agent
os-refresh-config

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

@ -2,7 +2,6 @@
set -eux
os-svc-daemon -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
os-svc-daemon -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

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

@ -3,4 +3,3 @@ set -eux
service neutron-metadata-agent restart
service neutron-l3-agent restart
service neutron-dhcp-agent restart