openstack/puppet-horizon
Code Issues Proposed changes

Add support for Neutron DVR and L3 HA options

Browse Source 
Neutron supports distributed virtual router (DVR) and
HA (High Availability) mode in Neutron virtual router since Juno.
Added support for them

Change-Id: Ia5ec54604bde82ed4c2e66d504f4307c8714e764
This commit is contained in:
Sergey Kolekonov 2015-04-02 14:34:34 +03:00
parent 4155185fef
commit f6bece8c53
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/init.pp
View File

@ -118,6 +118,11 @@
# security groups. Defaults to True.
# 'enable_vpn': Boolean to enable or disable Neutron's VPNaaS feature.
# Defaults to False.
# 'enable_distributed_router': Boolean to enable or disable Neutron
# distributed virtual router (DVR) feature in the Router panel.
# Defaults to False.
# 'enable_ha_router': Enable or disable HA (High Availability) mode in
# Neutron virtual router in the Router panel. Defaults to False.
# 'profile_support': A string indiciating which plugin-specific
# profiles to enable. Defaults to 'None', other options include
# 'cisco'.
@ -255,12 +260,14 @@ class horizon(
# be merged with user-provided options when the local_settings.py.erb
# template is interpolated.
$neutron_defaults = {
'enable_lb' => false,
'enable_firewall' => false,
'enable_quotas' => true,
'enable_security_group' => true,
'enable_vpn' => false,
'profile_support' => 'None',
'enable_lb' => false,
'enable_firewall' => false,
'enable_quotas' => true,
'enable_security_group' => true,
'enable_vpn' => false,
'enable_distributed_router' => false,
'enable_ha_router' => false,
'profile_support' => 'None',
}
Service <| title == 'memcached' |> -> Class['horizon']

5
spec/classes/horizon_init_spec.rb
View File

@ -60,6 +60,8 @@ describe 'horizon' do
" 'enable_quotas': True,",
" 'enable_security_group': True,",
" 'enable_vpn': False,",
" 'enable_distributed_router': False,",
" 'enable_ha_router': False,",
'API_RESULT_LIMIT = 1000',
"LOGIN_URL = '#{platforms_params[:root_url]}/auth/login/'",
"LOGOUT_URL = '#{platforms_params[:root_url]}/auth/logout/'",
@ -92,7 +94,8 @@ describe 'horizon' do
:compress_offline => false,
:hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true },
:cinder_options => {'enable_backup' => true },
:neutron_options => {'enable_lb' => true, 'enable_firewall' => true, 'enable_quotas' => false, 'enable_security_group' => false, 'enable_vpn' => true, 'profile_support' => 'cisco' },
:neutron_options => {'enable_lb' => true, 'enable_firewall' => true, 'enable_quotas' => false, 'enable_security_group' => false, 'enable_vpn' => true,
'enable_distributed_router' => false, 'enable_ha_router' => false, 'profile_support' => 'cisco', },
:file_upload_temp_dir => '/var/spool/horizon',
:secure_cookies => true
})

2
templates/local_settings.py.erb
View File

@ -202,6 +202,8 @@ OPENSTACK_NEUTRON_NETWORK = {
'enable_quotas': <%= @neutron_options['enable_quotas'].to_s.capitalize %>,
'enable_security_group': <%= @neutron_options['enable_security_group'].to_s.capitalize %>,
'enable_vpn': <%= @neutron_options['enable_vpn'].to_s.capitalize %>,
'enable_distributed_router': <%= @neutron_options['enable_distributed_router'].to_s.capitalize %>,
'enable_ha_router': <%= @neutron_options['enable_ha_router'].to_s.capitalize %>,
# The profile_support option is used to detect if an externa lrouter can be
# configured via the dashboard. When using specific plugins the
# profile_support can be turned on if needed.