48a38a1934
Firewall config was being inherited by the dpdk service, however since the firewall service name was the parent (neutron_ovs_agent) and technically that service was not enabled - the rules were never applied. This modifies the service name as it is inherited using map_replace. Closes-Bug: 1674689 Change-Id: I6676205b8fc1fd578cb2435ad97fe577a9e81d95 Signed-off-by: Tim Rozet <trozet@redhat.com>
85 lines
3.0 KiB
YAML
85 lines
3.0 KiB
YAML
heat_template_version: ocata
|
|
|
|
description: >
|
|
OpenStack Neutron OVS DPDK configured with Puppet for Compute Role
|
|
|
|
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
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
HostCpusList:
|
|
description: List of cores to be used for host process
|
|
type: string
|
|
constraints:
|
|
- allowed_pattern: "'[0-9,-]+'"
|
|
NeutronDpdkCoreList:
|
|
description: List of cores to be used for DPDK Poll Mode Driver
|
|
type: string
|
|
constraints:
|
|
- allowed_pattern: "'[0-9,-]+'"
|
|
NeutronDpdkMemoryChannels:
|
|
description: Number of memory channels to be used for DPDK
|
|
type: string
|
|
constraints:
|
|
- allowed_pattern: "[0-9]+"
|
|
NeutronDpdkSocketMemory:
|
|
default: ""
|
|
description: Memory allocated for each socket
|
|
type: string
|
|
NeutronDpdkDriverType:
|
|
default: "vfio-pci"
|
|
description: DPDK Driver type
|
|
type: string
|
|
# below parameters has to be set in neutron agent only for compute nodes.
|
|
# as of now there is no other usecase for these parameters except dpdk.
|
|
# should be moved to compute only ovs agent in case of any other usecases.
|
|
NeutronDatapathType:
|
|
default: ""
|
|
description: Datapath type for ovs bridges
|
|
type: string
|
|
NeutronVhostuserSocketDir:
|
|
default: ""
|
|
description: The vhost-user socket directory for OVS
|
|
type: string
|
|
|
|
resources:
|
|
|
|
NeutronOvsAgent:
|
|
type: ./neutron-ovs-agent.yaml
|
|
properties:
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Neutron OVS DPDK Agent service.
|
|
value:
|
|
service_name: neutron_ovs_dpdk_agent
|
|
config_settings:
|
|
map_merge:
|
|
- map_replace:
|
|
- get_attr: [NeutronOvsAgent, role_data, config_settings]
|
|
- keys:
|
|
tripleo.neutron_ovs_agent.firewall_rules: tripleo.neutron_ovs_dpdk_agent.firewall_rules
|
|
- neutron::agents::ml2::ovs::enable_dpdk: true
|
|
neutron::agents::ml2::ovs::datapath_type: {get_param: NeutronDatapathType}
|
|
neutron::agents::ml2::ovs::vhostuser_socket_dir: {get_param: NeutronVhostuserSocketDir}
|
|
vswitch::dpdk::host_core_list: {get_param: HostCpusList}
|
|
vswitch::dpdk::pmd_core_list: {get_param: NeutronDpdkCoreList}
|
|
vswitch::dpdk::memory_channels: {get_param: NeutronDpdkMemoryChannels}
|
|
vswitch::dpdk::socket_mem: {get_param: NeutronDpdkSocketMemory}
|
|
vswitch::dpdk::driver_type: {get_param: NeutronDpdkDriverType}
|
|
step_config: {get_attr: [NeutronOvsAgent, role_data, step_config]}
|