Revision da5374c5 src/vnm_mad/remotes/vxlan/vxlan_driver.rb

View differences:

src/vnm_mad/remotes/vxlan/vxlan_driver.rb
43 43
    # This function creates and activate a VLAN device
44 44
    ############################################################################
45 45
    def create_vlan_dev
46
        mc  = VNMMAD::VNMNetwork::IPv4.to_i(CONF[:vxlan_mc]) + @nic[:vlan_id].to_i
46
        mc  = VNMMAD::VNMNetwork::IPv4.to_i(@nic[:conf][:vxlan_mc]) +
47
                @nic[:vlan_id].to_i
47 48
        mcs = VNMMAD::VNMNetwork::IPv4.to_s(mc)
48 49
        mtu = @nic[:mtu] ? "mtu #{@nic[:mtu]}" : ""
49
        ttl = CONF[:vxlan_ttl] ? "ttl #{CONF[:vxlan_ttl]}" : ""
50
        ttl = @nic[:conf][:vxlan_ttl] ? "ttl #{@nic[:conf][:vxlan_ttl]}" : ""
50 51

  
51 52
        OpenNebula.exec_and_log("#{command(:ip)} link add #{@nic[:vlan_dev]}"\
52 53
            " #{mtu} type vxlan id #{@nic[:vlan_id]} group #{mcs} #{ttl}"\

Also available in: Unified diff