6556a9baae
As described in https://bugs.launchpad.net/neutron/+bug/1531890, the ovs agent does not use the 'agent_tunneling' setting in openvswitch_agent.ini, instead it uses 'tunnel_types'. This fix removes it from being set in the .ini file and also sets local_ip, tunnel_bridge, etc. based on the 'tunnel_types' hieradata parameter. The hieradata 'enable_tunneling' is being removed in https://review.openstack.org/#/c/335235/. Partial-Bug: 1532830 Change-Id: I73630653330c67444827f32740c44e9d25b5db31
64 lines
1.8 KiB
Puppet
64 lines
1.8 KiB
Puppet
### Cloud Controller:
|
|
|
|
# General Neutron stuff
|
|
# Configures everything in neutron.conf
|
|
class { '::neutron':
|
|
allow_overlapping_ips => true,
|
|
rabbit_password => 'password',
|
|
rabbit_user => 'guest',
|
|
rabbit_host => 'localhost',
|
|
service_plugins => ['metering']
|
|
}
|
|
|
|
# The API server talks to keystone for authorisation
|
|
class { '::neutron::server':
|
|
auth_password => 'password',
|
|
database_connection => 'mysql://neutron:password@192.168.1.1/neutron',
|
|
}
|
|
|
|
# Configure nova notifications system
|
|
class { '::neutron::server::notifications':
|
|
nova_admin_tenant_name => 'admin',
|
|
nova_admin_password => 'secrete',
|
|
}
|
|
|
|
# Various agents
|
|
class { '::neutron::agents::dhcp': }
|
|
class { '::neutron::agents::l3': }
|
|
class { '::neutron::agents::lbaas': }
|
|
class { '::neutron::agents::vpnaas': }
|
|
class { '::neutron::agents::metering': }
|
|
|
|
# This plugin configures Neutron for OVS on the server
|
|
# Agent
|
|
class { '::neutron::agents::ml2::ovs':
|
|
local_ip => '192.168.1.1',
|
|
tunnel_types => ['vxlan']
|
|
}
|
|
|
|
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
|
|
class { '::neutron::plugins::ml2':
|
|
type_drivers => ['vxlan'],
|
|
tenant_network_types => ['vxlan'],
|
|
vxlan_group => '239.1.1.1',
|
|
mechanism_drivers => ['openvswitch'],
|
|
vni_ranges => ['0:300']
|
|
}
|
|
|
|
### Compute Nodes:
|
|
# Generally, any machine with a neutron element running on it talks
|
|
# over Rabbit and needs to know if overlapping IPs (namespaces) are in use
|
|
class { '::neutron':
|
|
allow_overlapping_ips => true,
|
|
rabbit_password => 'password',
|
|
rabbit_user => 'guest',
|
|
rabbit_host => 'localhost',
|
|
}
|
|
|
|
# The agent/plugin combo also needs installed on clients
|
|
# Agent
|
|
class { '::neutron::agents::ml2::ovs':
|
|
local_ip => '192.168.1.11',
|
|
tunnel_types => ['vxlan']
|
|
}
|