add the use-firewall-driver checkbox

Change-Id: I3b7cbcdd0705d2abaadb45a05c72799e280768d2

deployment_scripts/puppet/modules/vmware_dvs/lib/puppet/parser/functions/get_agents_data.rb

@@ -8,6 +8,7 @@
     vcenter = args[0]['computes']
     physnet = args[1]["predefined_networks"]["admin_internal_net"]["L2"]["physnet"]
     netmaps = args[2]["vmware_dvs_net_maps"]
+    use_fw_driver = args[2]["vmware_dvs_fw_driver"]
     current_node = args[3].split(".")[0]
     controllersp = args[4].any? {|role| role.include?("controller")}
     primaryp = args[4].any? {|role| role.include?("primary")}
@@ -27,6 +28,7 @@
           vds = netmaps
         end
         agent["network_maps"] = physnet + ":" + vds
+        agent["use_fw_driver"] = use_fw_driver
         agent["ha_enabled"] = controllersp
         agent["primary"] = primaryp
         agents.push(agent)

deployment_scripts/puppet/modules/vmware_dvs/manifests/agent.pp

@@ -42,6 +42,7 @@ define vmware_dvs::agent(
   $vsphere_login       = 'administrator@vsphere.local',
   $vsphere_password    = 'StrongPassword!',
   $network_maps        = 'physnet1:dvSwitch1',
+  $use_fw_driver       = true,
   $neutron_url_timeout = '3600',
   $py_root             = '/usr/lib/python2.7/dist-packages',
   $ha_enabled          = true,
@@ -60,6 +61,13 @@ define vmware_dvs::agent(
   $ocf_pid_dir  = '/var/run/resource-agents/ocf-neutron-dvs-agent'
   $ocf_pid      = "${ocf_pid_dir}/${agent_name}.pid"
 
+  if $use_fw_driver {
+    $fw_driver = 'mech_vmware_dvs.agentDVS.vCenter_firewall.DVSFirewallDriver'
+  }
+  else {
+    $fw_driver = 'mech_vmware_dvs.agentDVS.noop.vCenterNOOP'
+  }
+
 
   if ! defined(Nova_config['neutron/url_timeout']) {
     nova_config {'neutron/url_timeout': value => $neutron_url_timeout}

deployment_scripts/puppet/modules/vmware_dvs/templates/agent_config.erb

@@ -3,7 +3,7 @@ host=<%= @host %>
 
 [securitygroup]
 enable_security_group = True
-firewall_driver=mech_vmware_dvs.agentDVS.vCenter_firewall.vCenterFirewallDriver
+firewall_driver=<%= @fw_driver %>
 
 [ml2_vmware]
 vsphere_login=<%= @vsphere_login %>

environment_config.yaml

@@ -1,6 +1,11 @@
 attributes:
   metadata:
     group: 'network'
+  vmware_dvs_fw_driver:
+    value: true
+    label: "Use the VMware DVS firewall driver"
+    weight: 20
+    type: "checkbox"
   vmware_dvs_net_maps:
     value: ""
     label: "Enter the dvSwitch's name."