openstack/tripleo-heat-templates
Code Issues Proposed changes

Add base neutron service configuration

Browse Source 
Include the neutron-base service definition to align pull in common
configurations. This might not be *absolutely* necessary as any required
common configuration would likely already be added by and OVS agent
service, etc. but it's better to be safe than sorry and it does keep
things consistent across the Neutron services.

Implements: blueprint tripleo-sriov
Change-Id: I10a9d9b29760475e6cd75e4057051c75a52ffbb7
This commit is contained in:
Brent Eagles 2016-08-26 14:14:24 -02:30 committed by Saravanan KR
parent 6c73acbde9
commit c4970316f7
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
puppet/services/neutron-sriov-agent.yaml
View File

@ -14,6 +14,11 @@ parameters:
DefaultPasswords: DefaultPasswords:
default: {} default: {}
type: json type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NeutronPhysicalDevMappings: NeutronPhysicalDevMappings:
description: > description: >
List of <physical_network>:<physical device> List of <physical_network>:<physical device>
@ -39,11 +44,15 @@ parameters:
Example "eth1:4096","eth2:128" Example "eth1:4096","eth2:128"
type: comma_delimited_list type: comma_delimited_list
default: "" default: ""
EndpointMap:
default: {} resources:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry. NeutronBase:
type: json type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs: outputs:
role_data: role_data:
@ -51,8 +60,10 @@ outputs:
value: value:
service_name: neutron_sriov_agent service_name: neutron_sriov_agent
config_settings: config_settings:
neutron::agents::ml2::sriov::physical_device_mappings: {get_param: NeutronPhysicalDevMappings} map_merge:
neutron::agents::ml2::sriov::exclude_devices: {get_param: NeutronExcludeDevices} - get_attr: [NeutronBase, role_data, config_settings]
tripleo::host::sriov::number_of_vfs: {get_param: NeutronSriovNumVFs} - neutron::agents::ml2::sriov::physical_device_mappings: {get_param: NeutronPhysicalDevMappings}
neutron::agents::ml2::sriov::exclude_devices: {get_param: NeutronExcludeDevices}
tripleo::host::sriov::number_of_vfs: {get_param: NeutronSriovNumVFs}
step_config: | step_config: |
include ::tripleo::profile::base::neutron::sriov include ::tripleo::profile::base::neutron::sriov