openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2020-06-12 06:18:39 +00:00 committed by Gerrit Code Review
parent 340038e3b8 8b0d9239a2
commit 828fceb8fc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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