Browse code

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

Jenkins authored on 2013/06/01 01:28:23
Showing 4 changed files
... ...
@@ -74,6 +74,11 @@ function quantum_plugin_configure_service() {
74 74
     if [[ "$LB_VLAN_RANGES" != "" ]]; then
75 75
         iniset /$Q_PLUGIN_CONF_FILE VLANS network_vlan_ranges $LB_VLAN_RANGES
76 76
     fi
77
+    if [[ "$Q_USE_SECGROUP" == "True" ]]; then
78
+        iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
79
+    else
80
+        iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
81
+    fi
77 82
 }
78 83
 
79 84
 function quantum_plugin_setup_interface_driver() {
... ...
@@ -82,6 +82,8 @@ function quantum_plugin_configure_service() {
82 82
     iniset /$Q_PLUGIN_CONF_FILE OFC driver $OFC_DRIVER
83 83
     iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_max OFC_RETRY_MAX
84 84
     iniset /$Q_PLUGIN_CONF_FILE OFC api_retry_interval OFC_RETRY_INTERVAL
85
+
86
+    _quantum_ovs_base_configure_firewall_driver
85 87
 }
86 88
 
87 89
 function quantum_plugin_setup_interface_driver() {
... ...
@@ -135,6 +135,8 @@ function quantum_plugin_configure_service() {
135 135
     if [[ $OVS_ENABLE_TUNNELING = "True" ]]; then
136 136
         iniset /$Q_PLUGIN_CONF_FILE OVS enable_tunneling True
137 137
     fi
138
+
139
+    _quantum_ovs_base_configure_firewall_driver
138 140
 }
139 141
 
140 142
 function quantum_plugin_setup_interface_driver() {
... ...
@@ -57,6 +57,8 @@ function quantum_plugin_configure_plugin_agent() {
57 57
 
58 58
 function quantum_plugin_configure_service() {
59 59
     iniset /$Q_PLUGIN_CONF_FILE OVS openflow_rest_api $RYU_API_HOST:$RYU_API_PORT
60
+
61
+    _quantum_ovs_base_configure_firewall_driver
60 62
 }
61 63
 
62 64
 function quantum_plugin_setup_interface_driver() {