~gandelman-a/ubuntu/saucy/neutron/limit_testr_concurrency

« back to all changes in this revision

Viewing changes to debian/neutron-server.upstart

  • Committer: James Page
  • Date: 2013-07-24 11:33:11 UTC
  • mfrom: (170.1.3 neutron-h2)
  • Revision ID: james.page@canonical.com-20130724113311-62fbupovfhiwwv97
* d/neutron-server.upstart: Execute correct server binary, fixup
  use of flags in /etc/default/neutron-server.
* d/p/bump-sqlalchemy-version.patch: Support SQLAlchemy >= 0.8 until
  upstream catches up.
* Re-jig test disablement patches:
  - d/p/disable-udev-tests.patch: Disable tests that use udev as it
    is not always available.
  - d/p/disable-ml2-notification-tests.patch: Disable failing ML2 plugin
    tests pending further investigation.
* d/p/fix-quantum-configuration.patch: Remove rej and orig cruft, re-added
  missing default core_plugin configuration.
* d/control: Drop pep8 from BD's, no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
 
14
14
script
15
15
        [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
16
 
        [ -r "$QUANTUM_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $QUANTUM_PLUGIN_CONFIG"
17
 
        exec start-stop-daemon --start --chuid neutron --exec /usr/bin/qauntum-server -- \
 
16
        [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG"
 
17
        exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-server -- \
18
18
            --config-file /etc/neutron/neutron.conf \
19
19
            --log-file /var/log/neutron/server.log $CONF_ARG
20
20
end script