openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add base neutron service configuration"

This commit is contained in:
Jenkins 2016-09-08 17:44:59 +00:00 committed by Gerrit Code Review
parent 6480942f4b c4970316f7
commit 158636bf93
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:
default: {}
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
NeutronPhysicalDevMappings:
description: >
List of <physical_network>:<physical device>
@ -39,11 +44,15 @@ parameters:
Example "eth1:4096","eth2:128"
type: comma_delimited_list
default: ""
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
resources:
NeutronBase:
type: ./neutron-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
@ -51,8 +60,10 @@ outputs:
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}
tripleo::host::sriov::number_of_vfs: {get_param: NeutronSriovNumVFs}
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
- 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: |
include ::tripleo::profile::base::neutron::sriov