tripleo-heat-templates/docker/services/neutron-sriov-agent.yaml
Martin Mágr cf3946e7ce Enable neutron-sriov-agent health check
This patch enables health check execution for neutron-sriov-agent docker container.

Partial-Bug: #1801068
Change-Id: I96e93c2eade261f3a3f44f5b8ffd4c1d75274c15
Depends-On: Ief543580e6b717bb9dba62b19ffe12aff5395ff9
Depends-On: Id5dc7d169301e45cb0abab7cecae67457db9fd96
(cherry picked from commit 9473817a09)
2018-12-19 08:36:12 +00:00

144 lines
5.4 KiB
YAML

heat_template_version: rocky
description: >
OpenStack Neutron SR-IOV service
parameters:
DockerNeutronSriovImage:
description: The container image to use for the Neutron SR-IOV agent
type: string
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
type: string
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
resources:
ContainersCommon:
type: ./containers-common.yaml
NeutronSriovAgentBase:
type: ../../puppet/services/neutron-sriov-agent.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
NeutronLogging:
type: OS::TripleO::Services::Logging::NeutronCommon
properties:
NeutronServiceName: sriov-nic-agent
outputs:
role_data:
description: Role data for Neutron sriov service
value:
service_name: {get_attr: [NeutronSriovAgentBase, role_data, service_name]}
config_settings:
map_merge:
- get_attr: [NeutronSriovAgentBase, role_data, config_settings]
- get_attr: [NeutronLogging, config_settings]
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config
step_config:
get_attr: [NeutronSriovAgentBase, role_data, step_config]
config_image: {get_param: DockerNeutronConfigImage}
kolla_config:
/var/lib/kolla/config_files/neutron_sriov_agent.json:
command:
list_join:
- ' '
- - /usr/bin/neutron-sriov-nic-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --config-dir /etc/neutron/conf.d/common
- get_attr: [NeutronLogging, cmd_extra_args]
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
permissions:
- path: /var/log/neutron
owner: neutron:neutron
recurse: true
docker_config:
step_4:
neutron_sriov_agent:
start_order: 10
image: {get_param: DockerNeutronSriovImage}
net: host
pid: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [NeutronSriovAgentBase, role_data, config_settings, 'neutron::rabbit_port']}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- {get_attr: [NeutronLogging, volumes]}
-
- /var/lib/kolla/config_files/neutron_sriov_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /sys/class/net:/sys/class/net:rw
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
metadata_settings:
get_attr: [NeutronSriovAgentBase, role_data, metadata_settings]
upgrade_tasks:
- when: step|int == 0
tags: common
block:
- name: Check if neutron_sriov_nic_agent is deployed
command: systemctl is-enabled --quiet neutron-sriov-nic-agent
ignore_errors: True
register: neutron_sriov_nic_agent_enabled_result
- name: Set fact neutron_sriov_nic_agent_enabled
set_fact:
neutron_sriov_nic_agent_enabled: "{{ neutron_sriov_nic_agent_enabled_result.rc == 0 }}"
- name: "PreUpgrade step0,validation: Check service neutron-sriov-nic-agent is running"
command: systemctl is-active --quiet neutron-sriov-nic-agent
when: neutron_sriov_nic_agent_enabled|bool
tags: validation
- when: step|int == 2
block:
- name: Stop and disable neutron_sriov_agent service
when: neutron_sriov_nic_agent_enabled|bool
service: name=neutron-sriov-nic-agent state=stopped enabled=no