fa83eb1b86
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>
(cherry picked from commit df31016a9a)
64 lines
1.9 KiB
YAML
64 lines
1.9 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Neutron ML2/VPP agent configured with Puppet
|
|
|
|
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
|
|
NeutronVPPAgentPhysnets:
|
|
description: >
|
|
List of <physical_network>:<VPP Interface>
|
|
Example: "physnet1:GigabitEthernet2/2/0,physnet2:GigabitEthernet2/3/0"
|
|
type: comma_delimited_list
|
|
default: ""
|
|
|
|
resources:
|
|
|
|
NeutronBase:
|
|
type: ./neutron-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Neutron ML2/VPP agent service.
|
|
value:
|
|
service_name: neutron_vpp_agent
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NeutronBase, role_data, config_settings]
|
|
- tripleo::profile::base::neutron::agents::vpp::physnet_mapping: {get_param: NeutronVPPAgentPhysnets}
|
|
step_config: |
|
|
include ::tripleo::profile::base::neutron::agents::vpp
|
|
metadata_settings:
|
|
get_attr: [NeutronBase, role_data, metadata_settings]
|