openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add j2 per-role MetricsQdrNetwork" into stable/train

This commit is contained in:
Zuul 2020-03-13 18:27:48 +00:00 committed by Gerrit Code Review
parent efb76fe3fe 025171a3ac
commit 0483cadf00
7 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -144,7 +144,13 @@ outputs:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
$NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::ceilometer::agent::notification::notifier_host_port: {get_param: MetricsQdrPort}
- {}
service_config_settings:

24
deployment/metrics/collectd-container-puppet.yaml
View File

@ -445,7 +445,13 @@ outputs:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
$NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::collectd::amqp_port:
get_param: MetricsQdrPort
tripleo::profile::base::metrics::collectd::amqp_user:
@ -552,12 +558,24 @@ outputs:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::collectd::sensubility::client_address:
str_replace:
template: "%{hiera('NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::collectd::sensubility::keepalive_interval:
get_param: CollectdSensubilityKeepaliveInterval
tripleo::profile::base::metrics::collectd::sensubility::tmp_base_dir:

32
deployment/metrics/qdr-container-puppet.yaml
View File

@ -181,7 +181,13 @@ outputs:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
$NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::qdr::listen_on_external: {get_param: MetricsQdrExternalEndpoint}
tripleo::profile::base::metrics::qdr::listener_port: {get_param: MetricsQdrPort}
tripleo::profile::base::metrics::qdr::username: {get_param: MetricsQdrUsername}
@ -215,12 +221,24 @@ outputs:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
principal:
str_replace:
template: "metrics-qdr/%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
NETWORK:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
tripleo::profile::base::metrics::qdr::ssl_profiles:
list_concat:
- get_param: MetricsQdrSSLProfiles
@ -234,7 +252,13 @@ outputs:
- internal_tls_enabled
-
- service: metrics-qdr
network: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
network:
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEMetricsQdrNetwork"
params:
ROLENAME: {get_param: RoleName}
type: node
- null
# BEGIN DOCKER SETTINGS

6
environments/metrics/collectd-write-qdr.yaml
View File

@ -14,9 +14,3 @@ parameter_defaults:
telemetry:
format: JSON
presettle: true
BlockStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::collectd::amqp_host: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"

6
environments/metrics/qdr-edge-only.yaml
View File

@ -10,12 +10,6 @@ parameter_defaults:
ExtraConfig:
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
tripleo::profile::base::metrics::qdr::router_mode: edge
BlockStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"
#MetricsQdrConnectors:
# - host: qdr-normal-sa-telemetry.apps.remote.tld
# port: 443

6
environments/metrics/qdr-form-controller-mesh.yaml
View File

@ -11,12 +11,6 @@ resource_registry:
parameter_defaults:
ControllerExtraConfig:
tripleo::profile::base::metrics::qdr::router_mode: interior
BlockStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('block_storage_hostname_resolve_network'))}"
CephStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('ceph_storage_hostname_resolve_network'))}"
ObjectStorageExtraConfig:
tripleo::profile::base::metrics::qdr::listener_addr: "%{hiera(hiera('object_storage_hostname_resolve_network'))}"
#MetricsQdrConnectors:
# - host: qdr-normal-sa-telemetry.apps.remote.tld
# port: 443

9
network/service_net_map.j2.yaml
View File

@ -49,7 +49,6 @@ parameters:
KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
KeystonePublicApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
ManilaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NeutronApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
OctaviaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
HeatApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
@ -102,6 +101,14 @@ parameters:
{%- for role in roles if not role.name.startswith('Ceph') %}
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
{%- endfor %}
# special-case for MetricsQdrNetwork, which will vary depending on role
{%- for role in roles if role.name == 'CephStorage' or role.name == 'BlockStorage' or role.name == 'ObjectStorage' %}
{{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
{%- endfor %}
{%- for role in roles if role.name != 'CephStorage' and role.name != 'BlockStorage' and role.name != 'ObjectStorage' %}
{{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
{%- endfor %}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry.
type: json