9574cd4d0f
Add IronicNeutronAgentReportInterval with a default of 30 seconds. Previously the ironic-neutron-agent used the global report interval in neutron. The global interval was increased to 300s in change: Ib3f7cd9d6c050140a5e8b59adf7fd8f65b12df2f. While the 300s interval may make sense for other agents, the ironic-neutron-agent can keep reporting at 30s, the previous default. Closes-Bug: #1940838 Depends-On: I6fc0eb085c09fb1e24ff09d4f8199d2cf57dd209 Change-Id: Id77662e9dd466ec8609354c2dbeee8592f599e72
145 lines
5.6 KiB
YAML
145 lines
5.6 KiB
YAML
heat_template_version: wallaby
|
|
|
|
description: >
|
|
OpenStack ironic-neutron-agent service
|
|
|
|
parameters:
|
|
ContainerIronicNeutronAgentImage:
|
|
description: The container image to use for the ironic-neutron-agent
|
|
type: string
|
|
ContainerNeutronConfigImage:
|
|
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. Use
|
|
parameter_merge_strategies to merge it with the defaults.
|
|
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
|
|
IronicPassword:
|
|
description: The password for the Ironic service and db account, used by the Ironic services
|
|
type: string
|
|
hidden: true
|
|
KeystoneRegion:
|
|
type: string
|
|
default: 'regionOne'
|
|
description: Keystone region for endpoint
|
|
IronicAuthStrategy:
|
|
type: string
|
|
description: Auth strategy to use with ironic.
|
|
default: 'keystone'
|
|
constraints:
|
|
- allowed_values: ['keystone', 'http_basic', 'noauth']
|
|
IronicNeutronAgentReportInterval:
|
|
type: number
|
|
default: 30
|
|
description: |
|
|
Seconds between reporting ironic node port state to server; should be
|
|
less than NeutronAgentDownTime, best if it is half or less than
|
|
NeutronAgentDownTime.
|
|
|
|
conditions:
|
|
auth_strategy_noauth:
|
|
equals: [{get_param: IronicAuthStrategy}, 'noauth']
|
|
auth_strategy_non_default:
|
|
contains: [{get_param: IronicAuthStrategy}, ['noauth', 'http_basic']]
|
|
|
|
resources:
|
|
ContainersCommon:
|
|
type: ../containers-common.yaml
|
|
|
|
NeutronBase:
|
|
type: ../neutron/neutron-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
NeutronLogging:
|
|
type: OS::TripleO::Services::Logging::NeutronCommon
|
|
properties:
|
|
NeutronServiceName: ironic-neutron-agent
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for ironic-neutron-agent service
|
|
value:
|
|
service_name: ironic_neutron_agent
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NeutronBase, role_data, config_settings]
|
|
- neutron::agents::ml2::networking_baremetal::username: 'ironic'
|
|
neutron::agents::ml2::networking_baremetal::password: {get_param: IronicPassword}
|
|
neutron::agents::ml2::networking_baremetal::auth_url: { get_param: [ EndpointMap, KeystoneInternal, uri_no_suffix ] }
|
|
neutron::agents::ml2::networking_baremetal::project_name: 'service'
|
|
neutron::agents::ml2::networking_baremetal::user_domain_name: 'Default'
|
|
neutron::agents::ml2::networking_baremetal::project_domain_name: 'Default'
|
|
neutron::agents::ml2::networking_baremetal::region_name: {get_param: KeystoneRegion}
|
|
neutron::agents::ml2::networking_baremetal::report_interval: {get_param: IronicNeutronAgentReportInterval}
|
|
- if:
|
|
- auth_strategy_non_default
|
|
- neutron::agents::ml2::networking_baremetal::auth_type:
|
|
if:
|
|
- auth_strategy_noauth
|
|
- 'none'
|
|
- {get_param: IronicAuthStrategy}
|
|
neutron::agents::ml2::networking_baremetal::endpoint_override: { get_param: [ EndpointMap, IronicInternal, uri_no_suffix ] }
|
|
- get_attr: [NeutronLogging, config_settings]
|
|
puppet_config:
|
|
config_volume: neutron
|
|
puppet_tags: neutron_config,ironic_neutron_agent_config
|
|
step_config:
|
|
include tripleo::profile::base::neutron::agents::networking_baremetal
|
|
config_image: {get_param: ContainerNeutronConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/ironic_neutron_agent.json:
|
|
command: /usr/bin/ironic-neutron-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
|
|
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:
|
|
ironic_neutron_agent:
|
|
start_order: 80
|
|
image: {get_param: ContainerIronicNeutronAgentImage}
|
|
net: host
|
|
pid: host
|
|
privileged: true
|
|
restart: always
|
|
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- {get_attr: [NeutronLogging, volumes]}
|
|
- - /var/lib/kolla/config_files/ironic_neutron_agent.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/neutron:/var/lib/kolla/config_files/src:ro
|
|
environment:
|
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
|
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
|
|
upgrade_tasks: []
|