ba7dfd9fab
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.
43 lines
1.4 KiB
Puppet
43 lines
1.4 KiB
Puppet
class kickstack::neutron::agent::l2::compute inherits kickstack {
|
|
|
|
include kickstack::neutron::config
|
|
|
|
$tenant_network_type = "$::kickstack::neutron_tenant_network_type"
|
|
|
|
case "$::kickstack::neutron_plugin" {
|
|
'ovs': {
|
|
case $tenant_network_type {
|
|
'gre': {
|
|
$local_tunnel_ip = getvar("ipaddress_${nic_data}")
|
|
class { 'neutron::agents::ovs':
|
|
bridge_mappings => [],
|
|
bridge_uplinks => [],
|
|
integration_bridge => $::kickstack::neutron_integration_bridge,
|
|
enable_tunneling => true,
|
|
local_ip => $local_tunnel_ip,
|
|
tunnel_bridge => $::kickstack::neutron_tunnel_bridge,
|
|
tunnel_types => ['gre'],
|
|
package_ensure => $::kickstack::package_version,
|
|
}
|
|
}
|
|
default: {
|
|
$bridge_uplinks = ["br-${nic_data}:${nic_data}"]
|
|
class { 'neutron::agents::ovs':
|
|
bridge_mappings => ["${::kickstack::neutron_physnet}:br-${nic_data}"],
|
|
bridge_uplinks => $bridge_uplinks,
|
|
integration_bridge => $::kickstack::neutron_integration_bridge,
|
|
enable_tunneling => false,
|
|
local_ip => '',
|
|
package_ensure => $::kickstack::package_version,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
'linuxbridge': {
|
|
class { "neutron::agents::linuxbridge":
|
|
physical_interface_mappings => "default:$nic_data"
|
|
}
|
|
}
|
|
}
|
|
}
|