Merge "Enable configuration of Neutron QoS" into stable/liberty
This commit is contained in:
commit
969dc20e3d
|
@ -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
|
||||
|
@ -893,6 +903,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}
|
||||
|
@ -987,6 +999,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'
|
||||
|
@ -465,6 +470,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}
|
||||
|
@ -579,6 +585,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]}
|
||||
|
|
|
@ -408,7 +408,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.
|
||||
|
@ -506,6 +506,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: ''
|
||||
|
@ -1026,6 +1036,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:
|
||||
|
@ -1346,6 +1366,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}
|
||||
|
@ -1359,6 +1380,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