← Back to branch summary

~ubuntu-branches/ubuntu/raring/quantum/raring-proposed

« back to all changes in this revision

Viewing changes to quantum/plugins/openvswitch/common/config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Yolanda Robla, James Page, Maru Newby
  • Date: 2013-01-11 09:14:35 UTC
  • mfrom: (2.1.17)
  • Revision ID: package-import@ubuntu.com-20130111091435-vaup7dwmtmajy5oe
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1085038
https://launchpad.net/bugs/1076747
[ Chuck Short ]
* New upstream version. 
* debian/patches/fix-quantum-configuration.patch: Refreshed.

[ Yolanda Robla ]
* debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
  upstart configuration for Metadata Agent.
* debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
  quantum-metadata-agent and metadata_agent.ini.
* debian/patches/fix-quantum-configuration.patch: Update rootwrap
  configuration in metadata_agent.ini file.
* debian/changelog: Updated package version
* d/p/fix-quantum-configuration.patch: refresh patches

[ James Page ]
* d/*.install: Install entry points from bin directory instead
  of easy-install ones generated during the package build process
  (LP: #1085038).
* d/control: Drop BD on python-dev-all; its not required.
* d/rules: Install multiple upstart configurations for quantum-l3-agent.
* d/control: Tidy package descriptions.
* d/*.postrm: Drop as debhelper will generate update-rc.d calls in
  maintainer scripts if required.
* d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
  is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
  is owned by root:root.
* d/*agent*.postinst: Dropped as permissions now correctly set in
  quantum-common.
* d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
  sqlite defaults for all plugins.
* d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.

[ Maru Newby ]
* debian/control: Remove unnecessary openvswitch-vswitch dependency
  from quantum-plugin-openvswitch (LP: #1076747).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/openvswitch/common/config.py
21
21
DEFAULT_VLAN_RANGES = []
22
22
DEFAULT_TUNNEL_RANGES = []
23
23
 
24
 
database_opts = [
25
 
    cfg.StrOpt('sql_connection', default='sqlite://'),
26
 
    cfg.IntOpt('sql_max_retries', default=-1),
27
 
    cfg.IntOpt('reconnect_interval', default=2),
28
 
]
29
 
 
30
24
ovs_opts = [
31
25
    cfg.StrOpt('integration_bridge', default='br-int'),
32
26
    cfg.BoolOpt('enable_tunneling', default=False),
33
27
    cfg.StrOpt('tunnel_bridge', default='br-tun'),
 
28
    cfg.StrOpt('int_peer_patch_port', default='patch-tun',
 
29
               help="Peer patch port in integration bridge for tunnel bridge"),
 
30
    cfg.StrOpt('tun_peer_patch_port', default='patch-int',
 
31
               help="Peer patch port in tunnel bridge for integration bridge"),
34
32
    cfg.StrOpt('local_ip', default=''),
35
33
    cfg.ListOpt('bridge_mappings',
36
34
                default=DEFAULT_BRIDGE_MAPPINGS,
53
51
]
54
52
 
55
53
 
56
 
cfg.CONF.register_opts(database_opts, "DATABASE")
57
54
cfg.CONF.register_opts(ovs_opts, "OVS")
58
55
cfg.CONF.register_opts(agent_opts, "AGENT")