x/anvil
Code Issues Proposed changes

Update init scripts to work with systemd

Browse Source 
* Updated systemd scripts to output stdout to /dev/null
* Updated systemd scripts to include daemon_args
* updated daemon_args to not inclue single quotes and moved that
to the init script itself.

Change-Id: I15d331f98a8fa3c87cafd8b7377ecc12ffdea6b2
This commit is contained in:
Kris Lindgren 2014-11-21 13:29:51 -07:00
parent 6463c39b40
commit f0fe260663
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
conf/components/neutron.yaml
View File

@ -22,9 +22,9 @@ integration_bridge: br-int
# When building a package for the neutron the arguments to the individual daemons
# will be expanded to include the following runtime arguments.
daemon_args:
neutron-server: "'--config-file=/etc/neutron/plugin.ini --config-file=/etc/neutron/neutron.conf'"
neutron-l3-agent: "'--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/neutron.conf'"
neutron-dhcp-agent: "'--config-file=/etc/neutron/dhcp_agent.ini --config-file=/etc/neutron/neutron.conf'"
neutron-metadata-agent: "'--config-file=/etc/neutron/metadata_agent.ini --config-file=/etc/neutron/neutron.conf'"
neutron-openvswitch-agent: "'--config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-file=/etc/neutron/neutron.conf'"
neutron-server: "--config-file=/etc/neutron/plugin.ini --config-file=/etc/neutron/neutron.conf"
neutron-l3-agent: "--config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/neutron.conf"
neutron-dhcp-agent: "--config-file=/etc/neutron/dhcp_agent.ini --config-file=/etc/neutron/neutron.conf"
neutron-metadata-agent: "--config-file=/etc/neutron/metadata_agent.ini --config-file=/etc/neutron/neutron.conf"
neutron-openvswitch-agent: "--config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-file=/etc/neutron/neutron.conf"
...

2
conf/templates/packaging/common.init
View File

@ -17,7 +17,7 @@ prog=openstack-$bin
exec="/usr/bin/$bin"
pidfile="/var/run/$package/\$prog.pid"
daemon_user=$package
daemon_args=$daemon_args
daemon_args='$daemon_args'
#raw
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

3
conf/templates/packaging/common.service
View File

@ -5,7 +5,8 @@ After=syslog.target network.target
[Service]
Type=simple
User=$package
ExecStart=/usr/bin/$bin
ExecStart=/usr/bin/$bin $daemon_args
StandardOutput=null
[Install]
WantedBy=multi-user.target