openstack/devstack
Code Issues Proposed changes

Merge "add firewall driver if we use quantum security group"

Browse Source
This commit is contained in:
Jenkins 2013-05-31 16:28:23 +00:00 committed by Gerrit Code Review
commit ac8a90fb41
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/quantum_plugins/linuxbridge
View File

@ -74,6 +74,11 @@ function quantum_plugin_configure_service() {
if [[ "$LB_VLAN_RANGES" != "" ]]; then if [[ "$LB_VLAN_RANGES" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE VLANS network_vlan_ranges $LB_VLAN_RANGES iniset /$Q_PLUGIN_CONF_FILE VLANS network_vlan_ranges $LB_VLAN_RANGES
fi fi
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
else
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
fi
} }
function quantum_plugin_setup_interface_driver() { function quantum_plugin_setup_interface_driver() {

2
lib/quantum_plugins/nec
View File

@ -82,6 +82,8 @@ function quantum_plugin_configure_service() {
iniset /$Q_PLUGIN_CONF_FILE OFC driver $OFC_DRIVER iniset /$Q_PLUGIN_CONF_FILE OFC driver $OFC_DRIVER
iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_max OFC_RETRY_MAX iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_max OFC_RETRY_MAX
iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_interval OFC_RETRY_INTERVAL iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_interval OFC_RETRY_INTERVAL
_quantum_ovs_base_configure_firewall_driver
} }
function quantum_plugin_setup_interface_driver() { function quantum_plugin_setup_interface_driver() {

2
lib/quantum_plugins/openvswitch
View File

@ -135,6 +135,8 @@ function quantum_plugin_configure_service() {
if [[ $OVS_ENABLE_TUNNELING = "True" ]]; then if [[ $OVS_ENABLE_TUNNELING = "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
fi fi
_quantum_ovs_base_configure_firewall_driver
} }
function quantum_plugin_setup_interface_driver() { function quantum_plugin_setup_interface_driver() {

2
lib/quantum_plugins/ryu
View File

@ -57,6 +57,8 @@ function quantum_plugin_configure_plugin_agent() {
function quantum_plugin_configure_service() { function quantum_plugin_configure_service() {
iniset /$Q_PLUGIN_CONF_FILE OVS openflow_rest_api $RYU_API_HOST:$RYU_API_PORT iniset /$Q_PLUGIN_CONF_FILE OVS openflow_rest_api $RYU_API_HOST:$RYU_API_PORT
_quantum_ovs_base_configure_firewall_driver
} }
function quantum_plugin_setup_interface_driver() { function quantum_plugin_setup_interface_driver() {