Browse Source

Merge "Unify metrics_qdr name to underscore" into stable/train

changes/12/735512/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
828fceb8fc
1 changed files with 14 additions and 14 deletions
  1. +14
    -14
      deployment/metrics/qdr-container-puppet.yaml

+ 14
- 14
deployment/metrics/qdr-container-puppet.yaml View File

@@ -43,7 +43,7 @@ parameters:
type: json
default:
tag: openstack.nova.consoleauth
file: /var/log/containers/qdrouterd/metrics-qdr.log
file: /var/log/containers/qdrouterd/metrics_qdr.log
MetricsQdrPort:
default: 5666
description: Service name or port number on which the qdrouterd will accept
@@ -156,7 +156,7 @@ outputs:
role_data:
description: Role data for the metrics Qdr role.
value:
service_name: metrics-qdr
service_name: metrics_qdr
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
service_config_settings:
rsyslog:
@@ -210,7 +210,7 @@ outputs:
tripleo::profile::base::metrics::qdr::listener_ssl_password: {get_param: MetricsQdrSslPassword}
tripleo::profile::base::metrics::qdr::listener_trusted_certs: {get_param: MetricsQdrTrustedCerts}
qdr::log_enable: 'info+'
qdr::log_output: '/var/log/qdrouterd/metrics-qdr.log'
qdr::log_output: '/var/log/qdrouterd/metrics_qdr.log'
qdr::listener_auth_peer: {get_param: MetricsQdrAuthenticateClient}
- if:
- internal_tls_enabled
@@ -234,7 +234,7 @@ outputs:
ROLENAME: {get_param: RoleName}
principal:
str_replace:
template: "metrics-qdr/%{hiera('fqdn_NETWORK')}"
template: "metrics_qdr/%{hiera('fqdn_NETWORK')}"
params:
NETWORK:
get_param:
@@ -260,7 +260,7 @@ outputs:
if:
- internal_tls_enabled
-
- service: metrics-qdr
- service: metrics_qdr
network:
get_param:
- ServiceNetMap
@@ -272,12 +272,12 @@ outputs:
- null
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: metrics-qdr
config_volume: metrics_qdr
step_config: |
include ::tripleo::profile::base::metrics::qdr
config_image: {get_param: ContainerMetricsQdrConfigImage}
kolla_config:
/var/lib/kolla/config_files/metrics-qdr.json:
/var/lib/kolla/config_files/metrics_qdr.json:
command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
config_files:
- source: "/var/lib/kolla/config_files/src/*"
@@ -309,7 +309,7 @@ outputs:
privileged: false
user: root
volumes:
- /var/log/containers/metrics-qdr:/var/log/qdrouterd:z
- /var/log/containers/metrics_qdr:/var/log/qdrouterd:z
command: ['/bin/bash', '-c', 'chown -R qdrouterd:qdrouterd /var/log/qdrouterd']
metrics_qdr:
start_order: 1
@@ -324,10 +324,10 @@ outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/metrics-qdr.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/metrics-qdr:/var/lib/kolla/config_files/src:ro
- /var/lib/metrics-qdr:/var/lib/qdrouterd:z
- /var/log/containers/metrics-qdr:/var/log/qdrouterd:z
- /var/lib/kolla/config_files/metrics_qdr.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/metrics_qdr:/var/lib/kolla/config_files/src:ro
- /var/lib/metrics_qdr:/var/lib/qdrouterd:z
- /var/log/containers/metrics_qdr:/var/log/qdrouterd:z
- if:
- internal_tls_enabled
- - /etc/pki/tls/certs/metrics_qdr.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/metrics_qdr.crt:ro
@@ -348,5 +348,5 @@ outputs:
setype: "{{ item.setype }}"
mode: "{{ item.mode|default(omit) }}"
with_items:
- { 'path': /var/log/containers/metrics-qdr, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
- { 'path': /var/lib/metrics-qdr, 'setype': svirt_sandbox_file_t }
- { 'path': /var/log/containers/metrics_qdr, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
- { 'path': /var/lib/metrics_qdr, 'setype': svirt_sandbox_file_t }

Loading…
Cancel
Save