Merge "SR-IOV nic agent changes in line with composable roles."
This commit is contained in:
commit
8b13b8c811
|
@ -168,6 +168,7 @@ resource_registry:
|
|||
# ComputeNeutronOvsAgent can be overriden to puppet/services/neutron-ovs-dpdk-agent.yaml also to enable DPDK
|
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml
|
||||
OS::TripleO::Services::Pacemaker: OS::Heat::None
|
||||
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
|
||||
OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
|
||||
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
|
||||
OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
|
||||
|
|
|
@ -195,6 +195,7 @@ parameters:
|
|||
- OS::TripleO::Services::ComputeNeutronMetadataAgent
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
- OS::TripleO::Services::NeutronSriovAgent
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the Compute Nodes.
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
heat_template_version: 2016-04-08
|
||||
|
||||
description: >
|
||||
OpenStack Neutron SR-IOV nic agent configured with Puppet
|
||||
|
||||
parameters:
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: >
|
||||
Mapping of service_name -> network name. Typically set via
|
||||
parameter_defaults in the resource registry. This mapping overrides those
|
||||
in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
NeutronPhysicalDevMappings:
|
||||
description: >
|
||||
List of <physical_network>:<physical device>
|
||||
All physical networks listed in network_vlan_ranges
|
||||
on the server should have mappings to appropriate
|
||||
interfaces on each agent.
|
||||
type: comma_delimited_list
|
||||
default: ""
|
||||
NeutronExcludeDevices:
|
||||
description: >
|
||||
List of <network_device>:<excluded_devices> mapping
|
||||
network_device to the agent's node-specific list of virtual functions
|
||||
that should not be used for virtual networking. excluded_devices is a
|
||||
semicolon separated list of virtual functions to exclude from
|
||||
network_device. The network_device in the mapping should appear in the
|
||||
physical_device_mappings list.
|
||||
type: comma_delimited_list
|
||||
default: ""
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron SR-IOV nic agent service.
|
||||
value:
|
||||
service_name: neutron_sriov_agent
|
||||
config_settings:
|
||||
neutron::agents::ml2::sriov::physical_device_mappings: {get_param: NeutronPhysicalDevMappings}
|
||||
neutron::agents::ml2::sriov::exclude_devices: {get_param: NeutronExcludeDevices}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::neutron::sriov
|
Loading…
Reference in New Issue