stackforge/kickstack
Code Issues Proposed changes

neutron: set tunnel_types

Browse Source 
Post-Havana, tunnel_network_type is deprecated in favor of
tunnel_types, and the puppetlabs-neutron module recently reflected this.
Update to be in line with current versions of that module.
This commit is contained in:
Florian Haas 2014-03-07 15:33:28 +00:00
parent abc950b685
commit ba7dfd9fab
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/neutron/agent/l2/compute.pp
View File

@ -16,6 +16,7 @@ class kickstack::neutron::agent::l2::compute inherits kickstack {
enable_tunneling => true,
local_ip => $local_tunnel_ip,
tunnel_bridge => $::kickstack::neutron_tunnel_bridge,
tunnel_types => ['gre'],
package_ensure => $::kickstack::package_version,
}
}

1
manifests/neutron/agent/l2/network.pp
View File

@ -19,6 +19,7 @@ class kickstack::neutron::agent::l2::network inherits kickstack {
enable_tunneling => true,
local_ip => $local_tunnel_ip,
tunnel_bridge => $::kickstack::neutron_tunnel_bridge,
tunnel_types => ['gre'],
require => Class['::kickstack::neutron::agent::l3'],
package_ensure => $::kickstack::package_version,
}