openstack/cookbook-openstack-network
Code Issues Proposed changes

Merge "Support fwaas on kilo release"

Browse Source
This commit is contained in:
Jenkins
2015-03-19 20:16:05 +00:00
committed by Gerrit Code Review
parent 9b1860a5ae ce2ae14df0
commit 0d9a47e146
4 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
attributes/default.rb
View File

@@ -431,6 +431,13 @@ default['openstack']['network']['lbaas']['periodic_interval'] = 10
# node['openstack']['network']['lbaas']['custom_interface_driver'] attribute.
# Set this attribute to 'other' in order to load a custom driver
default['openstack']['network']['lbaas_plugin'] = 'ovs'
# ============================= FWaaS Configuration ==================
# Set to True to enable firewall service
default['openstack']['network']['fwaas']['enabled'] = 'True'
# Firewall service driver with linux iptables
default['openstack']['network']['fwaas']['driver'] = 'neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver'
# Custom plugin to support new interface drivers.
default['openstack']['network']['lbaas']['custom_interface_driver'] = nil
@@ -1054,7 +1061,7 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
'neutron_packages' => ['openstack-neutron', 'openstack-neutron-ml2', 'iproute'],
'neutron_client_packages' => ['python-neutronclient'],
'neutron_dhcp_packages' => ['openstack-neutron', 'iproute'],
'neutron_l3_packages' => ['openstack-neutron', 'iproute', 'radvd'],
'neutron_l3_packages' => ['openstack-neutron', 'iproute', 'radvd', 'python-neutron-fwaas'],
'neutron_vpn_packages' => ['python-neutron-vpnaas', 'iproute'],
'vpn_device_driver_packages' => ['openswan'],
'neutron_lb_packages' => ['python-neutron-lbaas', 'haproxy', 'iproute'],
@@ -1116,7 +1123,7 @@ when 'debian'
'neutron_packages' => ['neutron-common', 'python-pyparsing', 'python-cliff'],
'neutron_client_packages' => ['python-neutronclient', 'python-pyparsing'],
'neutron_dhcp_packages' => ['neutron-dhcp-agent'],
'neutron_l3_packages' => ['neutron-l3-agent', 'radvd'],
'neutron_l3_packages' => ['neutron-l3-agent', 'radvd', 'python-neutron-fwaas'],
'neutron_vpn_packages' => ['python-neutron-vpnaas', 'neutron-vpn-agent'],
'vpn_device_driver_packages' => ['openswan'],
'neutron_lb_packages' => ['python-neutron-lbaas', 'neutron-lbaas-agent', 'haproxy'],