openstack/puppet-horizon
Code Issues Proposed changes

Remove the profile_support setting from OPENSTACK_NEUTRON_NETWORK

Browse Source 
... because the setting no longer exists in Horizon[1].

[1] a8f17150bfed4d30a0e5b06069ce85c8c3049bcb

Change-Id: I72a025697e41ba0a4fe1605c0cfd6f317fb7d803
This commit is contained in:
Takashi Kajinami 2021-01-02 12:24:36 +09:00
parent 9658f93fc1
commit b5d76caeba
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -148,9 +148,6 @@
# Defaults to False. # Defaults to False.
# 'enable_ha_router': Enable or disable HA (High Availability) mode in # 'enable_ha_router': Enable or disable HA (High Availability) mode in
# Neutron virtual router in the Router panel. Defaults to False. # 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'.
# #
# [*instance_options*] # [*instance_options*]
# (optional) A hash of parameters to enable or disable instance options # (optional) A hash of parameters to enable or disable instance options
@ -626,7 +623,6 @@ release. Use log_handlers instead')
'enable_security_group' => true, 'enable_security_group' => true,
'enable_distributed_router' => false, 'enable_distributed_router' => false,
'enable_ha_router' => false, 'enable_ha_router' => false,
'profile_support' => 'None',
} }
# Default options for the LAUNCH_INSTANCE_DEFAULTS section. These will # Default options for the LAUNCH_INSTANCE_DEFAULTS section. These will

4
spec/classes/horizon_init_spec.rb
View File

@ -115,8 +115,7 @@ describe 'horizon' do
:hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true }, :hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true },
:cinder_options => {'enable_backup' => true }, :cinder_options => {'enable_backup' => true },
:keystone_options => {'name' => 'native', 'can_edit_user' => true, 'can_edit_group' => true, 'can_edit_project' => true, 'can_edit_domain' => false, 'can_edit_role' => false}, :keystone_options => {'name' => 'native', 'can_edit_user' => true, 'can_edit_group' => true, 'can_edit_project' => true, 'can_edit_domain' => false, 'can_edit_role' => false},
:neutron_options => {'enable_quotas' => false, 'enable_security_group' => false, :neutron_options => {'enable_quotas' => false, 'enable_security_group' => false, 'enable_distributed_router' => false, 'enable_ha_router' => false,
'enable_distributed_router' => false, 'enable_ha_router' => false, 'profile_support' => 'cisco',
'supported_provider_types' => ['flat', 'vxlan'], 'supported_vnic_types' => ['*'], 'default_ipv4_subnet_pool_label' => 'None', }, 'supported_provider_types' => ['flat', 'vxlan'], 'supported_vnic_types' => ['*'], 'default_ipv4_subnet_pool_label' => 'None', },
:instance_options => {'disable_image' => true, 'disable_instance_snapshot' => true, 'disable_volume' => true, 'disable_volume_snapshot' => true, 'create_volume' => false }, :instance_options => {'disable_image' => true, 'disable_instance_snapshot' => true, 'disable_volume' => true, 'disable_volume_snapshot' => true, 'create_volume' => false },
:file_upload_temp_dir => '/var/spool/horizon', :file_upload_temp_dir => '/var/spool/horizon',
@ -182,7 +181,6 @@ describe 'horizon' do
" 'default_ipv4_subnet_pool_label': None,", " 'default_ipv4_subnet_pool_label': None,",
" 'enable_quotas': False,", " 'enable_quotas': False,",
" 'enable_security_group': False,", " 'enable_security_group': False,",
" 'profile_support': 'cisco',",
" 'supported_provider_types': ['flat', 'vxlan'],", " 'supported_provider_types': ['flat', 'vxlan'],",
" 'supported_vnic_types': ['*'],", " 'supported_vnic_types': ['*'],",
'OPENSTACK_ENABLE_PASSWORD_RETRIEVE = True', 'OPENSTACK_ENABLE_PASSWORD_RETRIEVE = True',

6
templates/local_settings.py.erb
View File

@ -453,12 +453,6 @@ LAUNCH_INSTANCE_DEFAULTS = {
# environment. # environment.
#'default_ipv6_subnet_pool_label': None, #'default_ipv6_subnet_pool_label': None,
# The profile_support option is used to detect if an external router can be
# configured via the dashboard. When using specific plugins the
# profile_support can be turned on if needed.
#'profile_support': None,
#'profile_support': 'cisco',
# Set which provider network types are supported. Only the network types # Set which provider network types are supported. Only the network types
# in this list will be available to choose from when creating a network. # in this list will be available to choose from when creating a network.
# Network types include local, flat, vlan, gre, and vxlan. # Network types include local, flat, vlan, gre, and vxlan.