diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-07 16:23:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-07 16:23:56 +0000 |
| commit | 9ba00e5ab8eec49fddd9ca03fdd9c07c41b088b7 (patch) | |
| tree | cf852b63b7783ddc9f0e19a1c5ddb1a5647b231d | |
| parent | d2dad24e0a094827cc4c4e855a7ae43c4c08ce44 (diff) | |
| parent | 905b784cd251baa1a1e2909ae53bf553f699a769 (diff) | |
| download | nova-9ba00e5ab8eec49fddd9ca03fdd9c07c41b088b7.tar.gz nova-9ba00e5ab8eec49fddd9ca03fdd9c07c41b088b7.tar.xz nova-9ba00e5ab8eec49fddd9ca03fdd9c07c41b088b7.zip | |
Merge "Change forward_bridge_interface to MultiStrOpt"
| -rw-r--r-- | nova/network/linux_net.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index f8a2f058b..08a2ae354 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -86,11 +86,11 @@ linux_net_opts = [ default=False, help='Use single default gateway. Only first nic of vm will ' 'get default gateway from dhcp server'), - cfg.ListOpt('forward_bridge_interface', - default=['all'], - help='An interface that bridges can forward to. If this is ' - 'set to all then all traffic will be forwarded. Can be ' - 'specified multiple times.'), + cfg.MultiStrOpt('forward_bridge_interface', + default=['all'], + help='An interface that bridges can forward to. If this ' + 'is set to all then all traffic will be forwarded. ' + 'Can be specified multiple times.'), cfg.StrOpt('metadata_host', default='$my_ip', help='the ip for the metadata api server'), |