------------------------------------------------------------ revno: 24 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Tue 2014-01-28 12:07:48 +0000 message: auto update added: etc/init/neutron-ovs-cleanup.conf modified: etc/init/neutron-dhcp-agent.conf etc/init/neutron-l3-agent.conf etc/init/neutron-plugin-mlnx-agent.conf etc/init/neutron-plugin-openvswitch-agent.conf
-- lp:~upstart-devel/upstart/upstart-jobs https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs Your team Upstart Reviewers is subscribed to branch lp:~upstart-devel/upstart/upstart-jobs. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/neutron-dhcp-agent.conf' --- etc/init/neutron-dhcp-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-dhcp-agent.conf 2014-01-28 12:07:48 +0000 @@ -12,6 +12,11 @@ pre-start script mkdir -p /var/run/neutron chown neutron:root /var/run/neutron + # Check to see if openvswitch plugin in use by checking + # status of cleanup upstart configuration + if status neutron-ovs-cleanup; then + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent + fi end script exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log === modified file 'etc/init/neutron-l3-agent.conf' --- etc/init/neutron-l3-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-l3-agent.conf 2014-01-28 12:07:48 +0000 @@ -12,6 +12,11 @@ pre-start script mkdir -p /var/run/neutron chown neutron:root /var/run/neutron + # Check to see if openvswitch plugin in use by checking + # status of cleanup upstart configuration + if status neutron-ovs-cleanup; then + start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent + fi end script exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log === added file 'etc/init/neutron-ovs-cleanup.conf' --- etc/init/neutron-ovs-cleanup.conf 1970-01-01 00:00:00 +0000 +++ etc/init/neutron-ovs-cleanup.conf 2014-01-28 12:07:48 +0000 @@ -0,0 +1,13 @@ +# vim:set ft=upstart ts=2 et: +description "Neutron OVS cleanup" +author "James Page <[email protected]>" + +start on started openvswitch-switch +stop on runlevel [!2345] + +pre-start script + [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0 + start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \ + --log-file /var/log/neutron/ovs-cleanup.log \ + --config-file /etc/neutron/neutron.conf --verbose +end script === modified file 'etc/init/neutron-plugin-mlnx-agent.conf' --- etc/init/neutron-plugin-mlnx-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-plugin-mlnx-agent.conf 2014-01-28 12:07:48 +0000 @@ -15,5 +15,5 @@ end script exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \ - --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx_conf.ini \ + --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \ --log-file=/var/log/neutron/mlnx_conf.log === modified file 'etc/init/neutron-plugin-openvswitch-agent.conf' --- etc/init/neutron-plugin-openvswitch-agent.conf 2013-11-18 12:42:03 +0000 +++ etc/init/neutron-plugin-openvswitch-agent.conf 2014-01-28 12:07:48 +0000 @@ -2,7 +2,7 @@ description "Neutron OpenvSwitch Plugin Agent" author "Chuck Short <[email protected]>" -start on runlevel [2345] +start on runlevel [2345] and started neutron-ovs-cleanup stop on runlevel [!2345] respawn @@ -14,4 +14,4 @@ chown neutron:root /var/run/neutron end script -exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log +exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
