Enable configuration of Neutron QoS
This change adds support for setting the configuration options required to enable the quality of service feature in Neutron. The default values will enable the feature. Note: this is a resubmission of a backport that was reverted by commitc495eab279
to address a problem in the neutron puppet modules. The fix to the puppet modules appears to be merged to the appropriate stable/liberty branches so this backport should be okay now. Closes-Bug: #1524052 Depends-On: Iefc289a6eee13b9c66f8131c258af982f232df4b (cherry picked from commitc9f12915ef
) (cherry picked from commit82a892f015
) Change-Id: I3d66496dc7959ae3a3ee06b094c4992e650c9751
This commit is contained in:
parent
94b00c7460
commit
fed481d852
|
@ -197,7 +197,7 @@ parameters:
|
|||
from neutron.core_plugins namespace.
|
||||
type: string
|
||||
NeutronServicePlugins:
|
||||
default: "router"
|
||||
default: "router,qos"
|
||||
description: |
|
||||
Comma-separated list of service plugin entrypoints to be loaded from the
|
||||
neutron.service_plugins namespace.
|
||||
|
@ -212,6 +212,16 @@ parameters:
|
|||
description: |
|
||||
The mechanism drivers for the Neutron tenant network.
|
||||
type: comma_delimited_list
|
||||
NeutronPluginExtensions:
|
||||
default: "qos"
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron plugin.
|
||||
type: comma_delimited_list
|
||||
NeutronAgentExtensions:
|
||||
default: "qos"
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron agents.
|
||||
type: comma_delimited_list
|
||||
NeutronAllowL3AgentFailover:
|
||||
default: 'False'
|
||||
description: Allow automatic l3-agent failover
|
||||
|
@ -885,6 +895,8 @@ resources:
|
|||
NeutronServicePlugins: {get_param: NeutronServicePlugins}
|
||||
NeutronTypeDrivers: {get_param: NeutronTypeDrivers}
|
||||
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
|
||||
NeutronPluginExtensions: {get_param: NeutronPluginExtensions}
|
||||
NeutronAgentExtensions: {get_param: NeutronAgentExtensions}
|
||||
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
|
||||
NeutronL3HA: {get_param: NeutronL3HA}
|
||||
NeutronDhcpAgentsPerNetwork: {get_param: NeutronDhcpAgentsPerNetwork}
|
||||
|
@ -978,6 +990,7 @@ resources:
|
|||
NeutronServicePlugins: {get_param: NeutronServicePlugins}
|
||||
NeutronTypeDrivers: {get_param: NeutronTypeDrivers}
|
||||
NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
|
||||
NeutronAgentExtensions: {get_param: NeutronAgentExtensions}
|
||||
# L3 HA and Failover is not relevant for Computes, should be removed
|
||||
NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover}
|
||||
NeutronL3HA: {get_param: NeutronL3HA}
|
||||
|
|
|
@ -157,7 +157,7 @@ parameters:
|
|||
from neutron.core_plugins namespace.
|
||||
type: string
|
||||
NeutronServicePlugins:
|
||||
default: "router"
|
||||
default: "router,qos"
|
||||
description: |
|
||||
Comma-separated list of service plugin entrypoints to be loaded from the
|
||||
neutron.service_plugins namespace.
|
||||
|
@ -172,6 +172,11 @@ parameters:
|
|||
description: |
|
||||
The mechanism drivers for the Neutron tenant network.
|
||||
type: comma_delimited_list
|
||||
NeutronAgentExtensions:
|
||||
default: "qos"
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron agents.
|
||||
type: comma_delimited_list
|
||||
# Not relevant for Computes, should be removed
|
||||
NeutronAllowL3AgentFailover:
|
||||
default: 'True'
|
||||
|
@ -456,6 +461,7 @@ resources:
|
|||
|
||||
neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
|
||||
neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
|
||||
neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
|
||||
neutron::plugins::ml2::network_vlan_ranges: {get_input: neutron_network_vlan_ranges}
|
||||
neutron::plugins::ml2::tunnel_id_ranges: {get_input: neutron_tunnel_id_ranges}
|
||||
neutron::plugins::ml2::vni_ranges: {get_input: neutron_vni_ranges}
|
||||
|
@ -569,6 +575,11 @@ resources:
|
|||
template: MECHANISMS
|
||||
params:
|
||||
MECHANISMS: {get_param: NeutronMechanismDrivers}
|
||||
neutron_agent_extensions:
|
||||
str_replace:
|
||||
template: AGENT_EXTENSIONS
|
||||
params:
|
||||
AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
|
||||
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
|
||||
neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
|
||||
neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]}
|
||||
|
|
|
@ -398,7 +398,7 @@ parameters:
|
|||
from neutron.core_plugins namespace.
|
||||
type: string
|
||||
NeutronServicePlugins:
|
||||
default: "router"
|
||||
default: "router,qos"
|
||||
description: |
|
||||
Comma-separated list of service plugin entrypoints to be loaded from the
|
||||
neutron.service_plugins namespace.
|
||||
|
@ -496,6 +496,16 @@ parameters:
|
|||
of VXLAN VNI IDs that are available for tenant network allocation
|
||||
default: ["1:1000", ]
|
||||
type: comma_delimited_list
|
||||
NeutronPluginExtensions:
|
||||
default: "qos"
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron plugin.
|
||||
type: comma_delimited_list
|
||||
NeutronAgentExtensions:
|
||||
default: "qos"
|
||||
description: |
|
||||
Comma-separated list of extensions enabled for the Neutron agents.
|
||||
type: comma_delimited_list
|
||||
NovaApiVirtualIP:
|
||||
type: string
|
||||
default: ''
|
||||
|
@ -1000,6 +1010,16 @@ resources:
|
|||
template: TYPES
|
||||
params:
|
||||
TYPES: {get_param: NeutronTunnelTypes}
|
||||
neutron_plugin_extensions:
|
||||
str_replace:
|
||||
template: PLUGIN_EXTENSIONS
|
||||
params:
|
||||
PLUGIN_EXTENSIONS: {get_param: NeutronPluginExtensions}
|
||||
neutron_agent_extensions:
|
||||
str_replace:
|
||||
template: AGENT_EXTENSIONS
|
||||
params:
|
||||
AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
|
||||
neutron_password: {get_param: NeutronPassword}
|
||||
neutron_dnsmasq_options: {get_param: NeutronDnsmasqOptions}
|
||||
neutron_dsn:
|
||||
|
@ -1314,6 +1334,7 @@ resources:
|
|||
neutron::enable_ovs_agent: {get_input: neutron_enable_ovs_agent}
|
||||
neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers}
|
||||
neutron::plugins::ml2::mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
||||
neutron::plugins::ml2::extension_drivers: {get_input: neutron_plugin_extensions}
|
||||
neutron::server::allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
||||
neutron::server::l3_ha: {get_input: neutron_l3_ha}
|
||||
neutron::dhcp_agents_per_network: {get_input: neutron_dhcp_agents_per_network}
|
||||
|
@ -1327,6 +1348,7 @@ resources:
|
|||
neutron_public_interface_tag: {get_input: neutron_public_interface_tag}
|
||||
neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
|
||||
neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
|
||||
neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
|
||||
neutron::server::auth_password: {get_input: neutron_password}
|
||||
neutron::agents::metadata::auth_password: {get_input: neutron_password}
|
||||
neutron_dnsmasq_options: {get_input: neutron_dnsmasq_options}
|
||||
|
|
Loading…
Reference in New Issue