df31016a9a
TLS certificates were introduced for the Neutron Base service in order for Neutron to securely communicate with OVS via SSL/TLS. However, the implementation only required Neutron DHCP agent (ODL deployment) to use the certificates. The other OVS agents are not used in ODL deployments and SSL/TLS use there may be added in the future. However, since other services inherit NeutronBase config_settings, they will attempt to generate certs. This certificate generation will fail because these services do not inherit metadata settings. This patch fixes the above issue by adding the metadata settings inheritance to every service derived from NeutronBase. Closes-Bug: 1754363 Change-Id: I87afc3a11efeefc1cfd768dfe817fbb3b2422694 Signed-off-by: Tim Rozet <trozet@redhat.com>
130 lines
4.5 KiB
YAML
130 lines
4.5 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Neutron OVS DPDK configured with Puppet for Compute Role
|
|
|
|
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
|
|
# 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
|
|
tags:
|
|
- role_specific
|
|
NeutronVhostuserSocketDir:
|
|
default: ""
|
|
description: The vhost-user socket directory for OVS
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
NeutronVhostuserSocketGroup:
|
|
default: "qemu"
|
|
description: >
|
|
The vhost-user socket directory group name.
|
|
Defaults to 'qemu'. When vhostuser mode is 'dpdkvhostuserclient'
|
|
(which is the default mode), the vhost socket is created by qemu.
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
NeutronVhostuserSocketUser:
|
|
default: "qemu"
|
|
description: >
|
|
The vhost-user socket directory user name.
|
|
Defaults to 'qemu'. When vhostuser mode is 'dpdkvhostuserclient'
|
|
(which is the default mode), the vhost socket is created by qemu.
|
|
type: string
|
|
tags:
|
|
- role_specific
|
|
|
|
resources:
|
|
|
|
NeutronOvsAgent:
|
|
type: ./neutron-ovs-agent.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
# Merging role-specific parameters (RoleParameters) with the default parameters.
|
|
# RoleParameters will have the precedence over the default parameters.
|
|
RoleParametersValue:
|
|
type: OS::Heat::Value
|
|
properties:
|
|
type: json
|
|
value:
|
|
map_replace:
|
|
- map_replace:
|
|
- neutron::agents::ml2::ovs::datapath_type: NeutronDatapathType
|
|
neutron::agents::ml2::ovs::vhostuser_socket_dir: NeutronVhostuserSocketDir
|
|
vhostuser_socket_group: NeutronVhostuserSocketGroup
|
|
vhostuser_socket_user: NeutronVhostuserSocketUser
|
|
- values: {get_param: [RoleParameters]}
|
|
- values:
|
|
NeutronDatapathType: {get_param: NeutronDatapathType}
|
|
NeutronVhostuserSocketDir: {get_param: NeutronVhostuserSocketDir}
|
|
NeutronVhostuserSocketGroup: {get_param: NeutronVhostuserSocketGroup}
|
|
NeutronVhostuserSocketUser: {get_param: NeutronVhostuserSocketUser}
|
|
|
|
Ovs:
|
|
type: ./openvswitch.yaml
|
|
properties:
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
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
|
|
- get_attr: [Ovs, role_data, config_settings]
|
|
- get_attr: [RoleParametersValue, value]
|
|
service_config_settings:
|
|
nova_libvirt:
|
|
nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
|
|
step_config: {get_attr: [NeutronOvsAgent, role_data, step_config]}
|
|
upgrade_tasks:
|
|
get_attr: [Ovs, role_data, upgrade_tasks]
|
|
metadata_settings:
|
|
get_attr: [NeutronOvsAgent, role_data, metadata_settings]
|