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>
114 lines
3.9 KiB
YAML
114 lines
3.9 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Neutron ML2/Nuage plugin 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
|
|
# Config specific parameters, to be provided via parameter_defaults
|
|
NeutronNuageNetPartitionName:
|
|
description: Specifies the title that you will see on the VSD
|
|
type: string
|
|
default: 'default_name'
|
|
|
|
NeutronNuageVSDIp:
|
|
description: IP address and port of the Virtual Services Directory
|
|
type: string
|
|
|
|
NeutronNuageVSDUsername:
|
|
description: Username to be used to log into VSD
|
|
type: string
|
|
|
|
NeutronNuageVSDPassword:
|
|
description: Password to be used to log into VSD
|
|
type: string
|
|
|
|
NeutronNuageVSDOrganization:
|
|
description: Organization parameter required to log into VSD
|
|
type: string
|
|
default: 'organization'
|
|
|
|
NeutronNuageBaseURIVersion:
|
|
description: URI version to be used based on the VSD release
|
|
type: string
|
|
default: 'default_uri_version'
|
|
|
|
NeutronNuageCMSId:
|
|
description: Cloud Management System ID (CMS ID) to distinguish between OS instances on the same VSD
|
|
type: string
|
|
|
|
UseForwardedFor:
|
|
description: Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
|
|
type: boolean
|
|
default: false
|
|
|
|
NovaPatchConfigMonkeyPatch:
|
|
description: Apply monkey patching or not
|
|
type: boolean
|
|
default: false
|
|
|
|
NovaPatchConfigMonkeyPatchModules:
|
|
description: List of modules/decorators to monkey patch
|
|
type: comma_delimited_list
|
|
default: ''
|
|
|
|
resources:
|
|
|
|
NeutronML2Base:
|
|
type: ./neutron-plugin-ml2.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}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Neutron ML2/Nuage plugin
|
|
value:
|
|
service_name: neutron_plugin_ml2_nuage
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NeutronML2Base, role_data, config_settings]
|
|
- neutron::plugins::ml2::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
|
|
neutron::plugins::ml2::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp}
|
|
neutron::plugins::ml2::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername}
|
|
neutron::plugins::ml2::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword}
|
|
neutron::plugins::ml2::nuage::nuage_vsd_organization: {get_param: NeutronNuageVSDOrganization}
|
|
neutron::plugins::ml2::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
|
|
neutron::plugins::ml2::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
|
|
nova::api::use_forwarded_for: {get_param: UseForwardedFor}
|
|
nova::patch::config::monkey_patch: {get_param: NovaPatchConfigMonkeyPatch}
|
|
nova::patch::config::monkey_patch_modules: {get_param: NovaPatchConfigMonkeyPatchModules}
|
|
step_config: |
|
|
include tripleo::profile::base::neutron::plugins::ml2
|
|
metadata_settings:
|
|
get_attr: [NeutronMl2Base, role_data, metadata_settings]
|