stackforge/puppet-openstack-cloud
Code Issues Proposed changes

neutron: fix plugin configuration

Browse Source 
move plugin class to privatecloud::network and use ML2 only

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-02 10:37:23 +01:00
parent aced810ba7
commit b83f9081d9
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/network.pp
View File

@ -69,4 +69,17 @@ class privatecloud::network(
local_ip => $tunnel_eth
}
class { 'neutron::plugins::ml2':
type_drivers => ['gre'],
tenant_network_types => ['gre'],
mechanism_drivers => ['openvswitch'],
tunnel_id_ranges => ['1:10000'],
# For later (when https://review.openstack.org/#/c/63228/ got merged)
# enable_security_group => true
}
# While https://review.openstack.org/#/c/63228/ is not merged:
neutron_plugin_ml2 {
'securitygroup/firewall_driver': value => true;
}
}

13
manifests/network/controller.pp
View File

@ -47,17 +47,4 @@ class privatecloud::network::controller(
options => 'check inter 2000 rise 2 fall 5'
}
class { 'neutron::plugins::ml2':
type_drivers => ['gre'],
tenant_network_types => ['gre'],
mechanism_drivers => ['openvswitch'],
tunnel_id_ranges => ['1:10000'],
# For later (when https://review.openstack.org/#/c/63228/ got merged)
# enable_security_group => true
}
# While https://review.openstack.org/#/c/63228/ is not merged:
neutron_plugin_ml2 {
'securitygroup/firewall_driver': value => true;
}
}