add the use-firewall-driver checkbox
Change-Id: I3b7cbcdd0705d2abaadb45a05c72799e280768d2
This commit is contained in:
parent
0985e43d79
commit
d4f384373b
|
@ -8,6 +8,7 @@
|
||||||
vcenter = args[0]['computes']
|
vcenter = args[0]['computes']
|
||||||
physnet = args[1]["predefined_networks"]["admin_internal_net"]["L2"]["physnet"]
|
physnet = args[1]["predefined_networks"]["admin_internal_net"]["L2"]["physnet"]
|
||||||
netmaps = args[2]["vmware_dvs_net_maps"]
|
netmaps = args[2]["vmware_dvs_net_maps"]
|
||||||
|
use_fw_driver = args[2]["vmware_dvs_fw_driver"]
|
||||||
current_node = args[3].split(".")[0]
|
current_node = args[3].split(".")[0]
|
||||||
controllersp = args[4].any? {|role| role.include?("controller")}
|
controllersp = args[4].any? {|role| role.include?("controller")}
|
||||||
primaryp = args[4].any? {|role| role.include?("primary")}
|
primaryp = args[4].any? {|role| role.include?("primary")}
|
||||||
|
@ -27,6 +28,7 @@
|
||||||
vds = netmaps
|
vds = netmaps
|
||||||
end
|
end
|
||||||
agent["network_maps"] = physnet + ":" + vds
|
agent["network_maps"] = physnet + ":" + vds
|
||||||
|
agent["use_fw_driver"] = use_fw_driver
|
||||||
agent["ha_enabled"] = controllersp
|
agent["ha_enabled"] = controllersp
|
||||||
agent["primary"] = primaryp
|
agent["primary"] = primaryp
|
||||||
agents.push(agent)
|
agents.push(agent)
|
||||||
|
|
|
@ -42,6 +42,7 @@ define vmware_dvs::agent(
|
||||||
$vsphere_login = 'administrator@vsphere.local',
|
$vsphere_login = 'administrator@vsphere.local',
|
||||||
$vsphere_password = 'StrongPassword!',
|
$vsphere_password = 'StrongPassword!',
|
||||||
$network_maps = 'physnet1:dvSwitch1',
|
$network_maps = 'physnet1:dvSwitch1',
|
||||||
|
$use_fw_driver = true,
|
||||||
$neutron_url_timeout = '3600',
|
$neutron_url_timeout = '3600',
|
||||||
$py_root = '/usr/lib/python2.7/dist-packages',
|
$py_root = '/usr/lib/python2.7/dist-packages',
|
||||||
$ha_enabled = true,
|
$ha_enabled = true,
|
||||||
|
@ -60,6 +61,13 @@ define vmware_dvs::agent(
|
||||||
$ocf_pid_dir = '/var/run/resource-agents/ocf-neutron-dvs-agent'
|
$ocf_pid_dir = '/var/run/resource-agents/ocf-neutron-dvs-agent'
|
||||||
$ocf_pid = "${ocf_pid_dir}/${agent_name}.pid"
|
$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']) {
|
if ! defined(Nova_config['neutron/url_timeout']) {
|
||||||
nova_config {'neutron/url_timeout': value => $neutron_url_timeout}
|
nova_config {'neutron/url_timeout': value => $neutron_url_timeout}
|
||||||
|
|
|
@ -3,7 +3,7 @@ host=<%= @host %>
|
||||||
|
|
||||||
[securitygroup]
|
[securitygroup]
|
||||||
enable_security_group = True
|
enable_security_group = True
|
||||||
firewall_driver=mech_vmware_dvs.agentDVS.vCenter_firewall.vCenterFirewallDriver
|
firewall_driver=<%= @fw_driver %>
|
||||||
|
|
||||||
[ml2_vmware]
|
[ml2_vmware]
|
||||||
vsphere_login=<%= @vsphere_login %>
|
vsphere_login=<%= @vsphere_login %>
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
attributes:
|
attributes:
|
||||||
metadata:
|
metadata:
|
||||||
group: 'network'
|
group: 'network'
|
||||||
|
vmware_dvs_fw_driver:
|
||||||
|
value: true
|
||||||
|
label: "Use the VMware DVS firewall driver"
|
||||||
|
weight: 20
|
||||||
|
type: "checkbox"
|
||||||
vmware_dvs_net_maps:
|
vmware_dvs_net_maps:
|
||||||
value: ""
|
value: ""
|
||||||
label: "Enter the dvSwitch's name."
|
label: "Enter the dvSwitch's name."
|
||||||
|
|
Loading…
Reference in New Issue