openstack
/
fuel-library
Code Issues Proposed changes

Merge pull request #798 from Mirantis/prd2509 

[PRD-2509] turn on quantum security groups
This commit is contained in:
Vladimir Kuklin 2013-11-07 08:56:31 -08:00
parent 532940bd5b d523278b6e
commit 86d4b43d65
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/nova/manifests/network/quantum.pp
View File

@ -21,7 +21,9 @@ class nova::network::quantum (
'DEFAULT/quantum_admin_username': value => $quantum_config['keystone']['admin_user'];
'DEFAULT/quantum_admin_password': value => $quantum_config['keystone']['admin_password'];
'DEFAULT/quantum_admin_auth_url': value => $quantum_config['keystone']['auth_url'];
'DEFAULT/firewall_driver': value => 'nova.virt.firewall.NoopFirewallDriver';
'DEFAULT/security_group_api': value => 'quantum';
}
}
# vim: set ts=2 sw=2 et :
# vim: set ts=2 sw=2 et :

34
deployment/puppet/quantum/manifests/init.pp
View File

@ -102,21 +102,23 @@ class quantum (
}
quantum_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/bind_host': value => $server_bind_host;
'DEFAULT/bind_port': value => $quantum_config['server']['bind_port'];
'DEFAULT/base_mac': value => $quantum_config['L2']['base_mac'];
'DEFAULT/mac_generation_retries': value => $quantum_config['L2']['mac_generation_retries'];
'DEFAULT/dhcp_lease_duration': value => $quantum_config['L3']['dhcp_agent']['lease_duration'];
'DEFAULT/allow_bulk': value => $quantum_config['server']['allow_bulk'];
'DEFAULT/allow_overlapping_ips': value => $quantum_config['L3']['allow_overlapping_ips'];
'DEFAULT/control_exchange': value => $quantum_config['server']['control_exchange'];
'DEFAULT/network_auto_schedule': value => $quantum_config['L3']['network_auto_schedule'];
'DEFAULT/router_auto_schedule': value => $quantum_config['L3']['router_auto_schedule'];
'DEFAULT/agent_down_time': value => $quantum_config['server']['agent_down_time'];
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/bind_host': value => $server_bind_host;
'DEFAULT/bind_port': value => $quantum_config['server']['bind_port'];
'DEFAULT/base_mac': value => $quantum_config['L2']['base_mac'];
'DEFAULT/mac_generation_retries': value => $quantum_config['L2']['mac_generation_retries'];
'DEFAULT/dhcp_lease_duration': value => $quantum_config['L3']['dhcp_agent']['lease_duration'];
'DEFAULT/allow_bulk': value => $quantum_config['server']['allow_bulk'];
'DEFAULT/allow_overlapping_ips': value => $quantum_config['L3']['allow_overlapping_ips'];
'DEFAULT/control_exchange': value => $quantum_config['server']['control_exchange'];
'DEFAULT/network_auto_schedule': value => $quantum_config['L3']['network_auto_schedule'];
'DEFAULT/router_auto_schedule': value => $quantum_config['L3']['router_auto_schedule'];
'DEFAULT/agent_down_time': value => $quantum_config['server']['agent_down_time'];
'DEFAULT/firewall_driver': value => 'quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver';
'quota/quota_driver': value => 'quantum.db.quota_db.DbQuotaDriver';
'keystone_authtoken/auth_host': value => $quantum_config['keystone']['auth_host'];
'keystone_authtoken/auth_port': value => $quantum_config['keystone']['auth_port'];
'keystone_authtoken/auth_url': value => $quantum_config['keystone']['auth_url'];
@ -204,4 +206,4 @@ class quantum (
anchor {'quantum-init-done':}
}
# vim: set ts=2 sw=2 et :
# vim: set ts=2 sw=2 et :

13
deployment/puppet/quantum/manifests/plugins/ovs.pp
View File

@ -65,11 +65,12 @@ class quantum::plugins::ovs (
'DATABASE/reconnect_interval': value => $quantum_config['database']['reconnect_interval'];
} ->
quantum_plugin_ovs {
'OVS/integration_bridge': value => $quantum_config['L2']['integration_bridge'];
'OVS/tenant_network_type': value => $quantum_config['L2']['segmentation_type'];
'OVS/enable_tunneling': value => $quantum_config['L2']['enable_tunneling'];
'AGENT/polling_interval': value => $quantum_config['polling_interval'];
'AGENT/root_helper': value => $quantum_config['root_helper'];
'OVS/integration_bridge': value => $quantum_config['L2']['integration_bridge'];
'OVS/tenant_network_type': value => $quantum_config['L2']['segmentation_type'];
'OVS/enable_tunneling': value => $quantum_config['L2']['enable_tunneling'];
'AGENT/polling_interval': value => $quantum_config['polling_interval'];
'AGENT/root_helper': value => $quantum_config['root_helper'];
'securitygroup/firewall_driver': value => 'quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver';
}
if $quantum_config['L2']['enable_tunneling'] {
@ -99,4 +100,4 @@ class quantum::plugins::ovs (
anchor {'quantum-plugin-ovs-done':}
}
# vim: set ts=2 sw=2 et :
# vim: set ts=2 sw=2 et :