L23network related fixes:
* l23network module initialization for granular deployment * wrong bridge type while creating integration and tun bridge. * bug/1446187 Note: After refactoring L23network module default provider for bridges was changed from 'ovs' to 'lnx', but Neutron requires 'ovs' bridges in any way. Neutron no more need for creating br-int and br-tun (upstream-bug: https://bugs.launchpad.net/puppet-neutron/+bug/1436422) Change-Id: Ib28558f64111c967cfdd1b6ed1a2008b5767cb87 Closes-bug: #1440681 Closes-bug: #1446187 Closes-bug: #1447665 Closes-bug: #1447085 Closes-bug: #1448157
This commit is contained in:
@@ -5,8 +5,9 @@ require 'yaml'
|
||||
class Puppet::Provider::L2_base < Puppet::Provider
|
||||
|
||||
def self.ovs_vsctl(*cmd)
|
||||
actual_cmd = ['ovs-vsctl'] + Array(*cmd)
|
||||
begin
|
||||
ff = IO.popen(['ovs-vsctl'] + Array(*cmd))
|
||||
ff = IO.popen(actual_cmd.join(' '))
|
||||
rv = ff.readlines().map{|l| l.chomp()}
|
||||
rescue
|
||||
rv = nil
|
||||
|
||||
Reference in New Issue
Block a user