← Back to branch summary

~ubuntu-branches/ubuntu/quantal/quantum/quantal-updates

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-09-21 13:01:18 UTC
  • mfrom: (2.1.13)
  • Revision ID: package-import@ubuntu.com-20120921130118-1g2oowz454jlbu40
Tags: 2012.2~rc2-0ubuntu1
https://launchpad.net/bugs/1009294
[ Adam Gandelman ]
* debian/quantum-server.{default, upstart}: Use default file to specify
  path to plugin config, which is passed to quantum-server as
  '--config-file' during startup. (LP: #1009294)
* debian/control:
  - Remove quantum-server's dependency on 'quantum-plugin'.
  - Specify >= 1:0.1.0.1-0ubuntu1 requirement for python-quantumclient.
  - Add dnsmasq dependencies to quantum-dhcp-agent Depends.

[ Chuck Short ]
* New upstream version.
* debian/patches/fix-ubuntu-tests.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
44
44
 
45
45
config_path = 'etc/quantum/'
46
46
init_path = 'etc/init.d'
 
47
rootwrap_path = 'etc/quantum/rootwrap.d'
47
48
ovs_plugin_config_path = 'etc/quantum/plugins/openvswitch'
48
49
cisco_plugin_config_path = 'etc/quantum/plugins/cisco'
49
50
linuxbridge_plugin_config_path = 'etc/quantum/plugins/linuxbridge'
58
59
         'etc/rootwrap.conf',
59
60
         'etc/api-paste.ini',
60
61
         'etc/policy.json',
61
 
         'etc/dhcp_agent.ini']),
 
62
         'etc/dhcp_agent.ini',
 
63
         'etc/l3_agent.ini']),
 
64
    (rootwrap_path,
 
65
        ['etc/quantum/rootwrap.d/dhcp.filters',
 
66
         'etc/quantum/rootwrap.d/iptables-firewall.filters',
 
67
         'etc/quantum/rootwrap.d/l3.filters',
 
68
         'etc/quantum/rootwrap.d/linuxbridge-plugin.filters',
 
69
         'etc/quantum/rootwrap.d/nec-plugin.filters',
 
70
         'etc/quantum/rootwrap.d/openvswitch-plugin.filters',
 
71
         'etc/quantum/rootwrap.d/ryu-plugin.filters']),
62
72
    (init_path, ['etc/init.d/quantum-server']),
63
73
    (ovs_plugin_config_path,
64
74
        ['etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini']),