openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add netcontrold service for DPDK roles"

Browse Source
This commit is contained in:
Zuul 2019-12-13 02:29:05 +00:00 committed by Gerrit Code Review
commit 56f5555d9e
9 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml Normal file
View File

@ -0,0 +1,81 @@
heat_template_version: rocky
description: >
netcontrold configuration for ovs-dpdk
parameters:
ServiceData:
default: {}
description: Dictionary packing service data
type: json
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
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
ContainerOpenvswitchNetcontroldImage:
description: netcontrold container image
type: string
DockerOpenvswitchUlimit:
default: ['nofile=16384']
description: ulimit for Openvswitch Container
type: comma_delimited_list
resources:
ContainersCommon:
type: ../containers-common.yaml
outputs:
role_data:
description: Role data for the netcontrold service
value:
service_name: openvswitch_dpdk_netcontrold
kolla_config:
/var/lib/kolla/config_files/ovs_dpdk_netcontrold.json:
command: "/usr/local/bin/ncd_watch"
docker_config:
step_5:
openvswitch_dpdk_netcontrold:
image: {get_param: ContainerOpenvswitchNetcontroldImage}
net: host
pid: host
privileged: true
security_opt: 'label=disable'
restart: always
depends_on:
- openvswitch
ulimit: {get_param: DockerOpenvswitchUlimit}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/ovs_dpdk_netcontrold.json:/var/lib/kolla/config_files/config.json:ro
- /lib/modules:/lib/modules:ro
- /sys/kernel/debug:/sys/kernel/debug
- /run/openvswitch:/run/openvswitch:shared,z
- /var/log/containers/netcontrold:/var/log/netcontrold:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
host_prep_tasks:
- name: create persistent directories - /var/log/containers/netcontrold
file:
path: "/var/log/containers/netcontrold"
state: directory
setype: "svirt_sandbox_file_t"

2
environments/services/netcontrold.yaml Normal file
View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::OvsDpdkNetcontrold: ../../deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -156,6 +156,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-container-puppet.yaml
OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OvsDpdkNetcontrold: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
OS::TripleO::Services::NeutronCorePluginVTS: deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml

5
releasenotes/notes/ovsdpdk_netcontrold-0a1d4f3e26cea0c6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Added a TripleO service OvsDpdkNetcontrold to enable netcontrold PMD
rebalance tool for OvS-DPDK deployments.

1
roles/ComputeHCIOvsDpdk.yaml
View File

@ -50,6 +50,7 @@
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::NovaLibvirtGuests
- OS::TripleO::Services::NovaMigrationTarget
- OS::TripleO::Services::OvsDpdkNetcontrold
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear

1
roles/ComputeOvsDpdk.yaml
View File

@ -51,6 +51,7 @@
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::OVNMetadataAgent
- OS::TripleO::Services::OvsDpdkNetcontrold
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Rhsm

1
roles/ComputeOvsDpdkRT.yaml
View File

@ -52,6 +52,7 @@
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::OVNMetadataAgent
- OS::TripleO::Services::OvsDpdkNetcontrold
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Rhsm

1
roles/ComputeOvsDpdkSriov.yaml
View File

@ -49,6 +49,7 @@
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::OVNMetadataAgent
- OS::TripleO::Services::OvsDpdkNetcontrold
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar

1
roles/ComputeOvsDpdkSriovRT.yaml
View File

@ -51,6 +51,7 @@
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::OVNController
- OS::TripleO::Services::OVNMetadataAgent
- OS::TripleO::Services::OvsDpdkNetcontrold
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar