Merge "Simplify metrics and messaging service templates"
This commit is contained in:
commit
c737ed6655
|
@ -53,7 +53,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
@ -132,8 +131,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
- - /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
- /var/lib/kolla/config_files/qdrouterd.json:/var/lib/kolla/config_files/config.json:ro
|
|
||||||
- /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
|
- /var/lib/config-data/puppet-generated/qdrouterd:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/lib/qdrouterd:/var/lib/qdrouterd:z
|
- /var/lib/qdrouterd:/var/lib/qdrouterd:z
|
||||||
- /var/log/containers/qdrouterd:/var/log/qdrouterd:z
|
- /var/log/containers/qdrouterd:/var/log/qdrouterd:z
|
||||||
|
|
|
@ -349,10 +349,10 @@ resources:
|
||||||
tripleo_collectd_enable_mcelog: {get_param: CollectdEnableMcelog}
|
tripleo_collectd_enable_mcelog: {get_param: CollectdEnableMcelog}
|
||||||
tripleo_collectd_enable_libpodstats: {get_param: CollectdEnableLibpodstats }
|
tripleo_collectd_enable_libpodstats: {get_param: CollectdEnableLibpodstats }
|
||||||
# The last element should be the CollectdVars, which overides any previous deprecated metric.
|
# The last element should be the CollectdVars, which overides any previous deprecated metric.
|
||||||
- { get_param: CollectdVars }
|
- {get_param: CollectdVars}
|
||||||
- if:
|
- if:
|
||||||
- role_specific_required
|
- role_specific_required
|
||||||
- { get_param: [RoleParameters, CollectdVars]}
|
- {get_param: [RoleParameters, CollectdVars]}
|
||||||
- {}
|
- {}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
@ -400,8 +400,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
- - /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
- /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
|
|
||||||
- /var/lib/containers/storage/overlay-containers:/var/lib/containers/storage/overlay-containers:ro
|
- /var/lib/containers/storage/overlay-containers:/var/lib/containers/storage/overlay-containers:ro
|
||||||
- /var/lib/config-data/ansible-generated/collectd:/var/lib/kolla/config_files/src:ro
|
- /var/lib/config-data/ansible-generated/collectd:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/log/containers/collectd:/var/log/collectd:rw,z
|
- /var/log/containers/collectd:/var/log/collectd:rw,z
|
||||||
|
|
|
@ -392,12 +392,12 @@ parameters:
|
||||||
conditions:
|
conditions:
|
||||||
amqp_connection:
|
amqp_connection:
|
||||||
equals: [{get_param: CollectdConnectionType}, 'amqp1']
|
equals: [{get_param: CollectdConnectionType}, 'amqp1']
|
||||||
amqp_default_connection:
|
amqp_connection_set:
|
||||||
equals: [{get_param: CollectdAmqpHost}, nil]
|
not: {equals: [{get_param: CollectdAmqpHost}, nil]}
|
||||||
amqp_default_interval:
|
amqp_interval_set:
|
||||||
equals: [{get_param: CollectdAmqpInterval}, -666]
|
not: {equals: [{get_param: CollectdAmqpInterval}, -666]}
|
||||||
amqp_default_send_queue_limit:
|
amqp_send_queue_limit_set:
|
||||||
equals: [{get_param: CollectdAmqpSendQueueLimit}, -1]
|
not: {equals: [{get_param: CollectdAmqpSendQueueLimit}, -1]}
|
||||||
collectd_connection:
|
collectd_connection:
|
||||||
equals: [{get_param: CollectdConnectionType}, 'network']
|
equals: [{get_param: CollectdConnectionType}, 'network']
|
||||||
gnocchi_connection:
|
gnocchi_connection:
|
||||||
|
@ -408,11 +408,6 @@ conditions:
|
||||||
and:
|
and:
|
||||||
- equals: [{get_param: CollectdGnocchiServer}, nil]
|
- equals: [{get_param: CollectdGnocchiServer}, nil]
|
||||||
- equals: [{get_param: CollectdGnocchiKeystoneEndpoint}, nil]
|
- equals: [{get_param: CollectdGnocchiKeystoneEndpoint}, nil]
|
||||||
enable_sensubility:
|
|
||||||
equals: [{get_param: CollectdEnableSensubility}, true]
|
|
||||||
enable_stf:
|
|
||||||
equals: [{get_param: EnableSTF}, true]
|
|
||||||
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
|
|
||||||
sensubility_needs_sudo:
|
sensubility_needs_sudo:
|
||||||
not:
|
not:
|
||||||
equals: [{get_param: CollectdSensubilityExecSudoRule}, '']
|
equals: [{get_param: CollectdSensubilityExecSudoRule}, '']
|
||||||
|
@ -432,7 +427,7 @@ outputs:
|
||||||
map_merge:
|
map_merge:
|
||||||
- tripleo::profile::base::metrics::collectd::enable_file_logging: true
|
- tripleo::profile::base::metrics::collectd::enable_file_logging: true
|
||||||
collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
|
collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
|
||||||
- collectd::manage_repo: false
|
collectd::manage_repo: false
|
||||||
collectd::purge: true
|
collectd::purge: true
|
||||||
collectd::recurse: true
|
collectd::recurse: true
|
||||||
collectd::purge_config: true
|
collectd::purge_config: true
|
||||||
|
@ -468,12 +463,10 @@ outputs:
|
||||||
- 'perf'
|
- 'perf'
|
||||||
collectd::plugin::virt::hostname_format: "hostname"
|
collectd::plugin::virt::hostname_format: "hostname"
|
||||||
tripleo.collectd.plugins.collectd:
|
tripleo.collectd.plugins.collectd:
|
||||||
yaql:
|
list_concat_unique:
|
||||||
data:
|
- {get_param: CollectdDefaultPlugins}
|
||||||
default_plugins: {get_param: CollectdDefaultPlugins}
|
- if:
|
||||||
stf_plugins:
|
- {get_param: EnableSTF}
|
||||||
if:
|
|
||||||
- enable_stf
|
|
||||||
- - cpu
|
- - cpu
|
||||||
- df
|
- df
|
||||||
- load
|
- load
|
||||||
|
@ -481,11 +474,7 @@ outputs:
|
||||||
- intel_rdt
|
- intel_rdt
|
||||||
- ipmi
|
- ipmi
|
||||||
- procevent
|
- procevent
|
||||||
- []
|
- {get_param: CollectdExtraPlugins}
|
||||||
extra_plugins: {get_param: CollectdExtraPlugins}
|
|
||||||
expression: >
|
|
||||||
($.data.default_plugins + $.data.stf_plugins + $.data.extra_plugins)
|
|
||||||
.flatten().distinct()
|
|
||||||
- if: # Collectd connected to QDR
|
- if: # Collectd connected to QDR
|
||||||
- amqp_connection
|
- amqp_connection
|
||||||
- map_merge:
|
- map_merge:
|
||||||
|
@ -497,18 +486,24 @@ outputs:
|
||||||
get_param: CollectdAmqpInstances
|
get_param: CollectdAmqpInstances
|
||||||
tripleo::profile::base::metrics::collectd::amqp_retry_delay:
|
tripleo::profile::base::metrics::collectd::amqp_retry_delay:
|
||||||
get_param: CollectdAmqpRetryDelay
|
get_param: CollectdAmqpRetryDelay
|
||||||
|
tripleo::profile::base::metrics::collectd::amqp_interval:
|
||||||
|
if:
|
||||||
|
- amqp_interval_set
|
||||||
|
- {get_param: CollectdAmqpInterval}
|
||||||
|
tripleo::profile::base::metrics::collectd::amqp_default_send_queue_limit:
|
||||||
|
if:
|
||||||
|
- amqp_send_queue_limit_set
|
||||||
|
- {get_param: CollectdAmqpSendQueueLimit}
|
||||||
- if:
|
- if:
|
||||||
- amqp_default_interval
|
- amqp_connection_set
|
||||||
- {}
|
- tripleo::profile::base::metrics::collectd::amqp_host:
|
||||||
- tripleo::profile::base::metrics::collectd::amqp_interval:
|
get_param: CollectdAmqpHost
|
||||||
get_param: CollectdAmqpInterval
|
tripleo::profile::base::metrics::collectd::amqp_port:
|
||||||
- if:
|
get_param: CollectdAmqpPort
|
||||||
- amqp_default_send_queue_limit
|
tripleo::profile::base::metrics::collectd::amqp_user:
|
||||||
- {}
|
get_param: CollectdAmqpUser
|
||||||
- tripleo::profile::base::metrics::collectd::amqp_default_send_queue_limit:
|
tripleo::profile::base::metrics::collectd::amqp_password:
|
||||||
get_param: CollectdAmqpSendQueueLimit
|
get_param: CollectdAmqpPassword
|
||||||
- if:
|
|
||||||
- amqp_default_connection
|
|
||||||
- tripleo::profile::base::metrics::collectd::amqp_host:
|
- tripleo::profile::base::metrics::collectd::amqp_host:
|
||||||
str_replace:
|
str_replace:
|
||||||
template:
|
template:
|
||||||
|
@ -527,15 +522,6 @@ outputs:
|
||||||
get_param: MetricsQdrUsername
|
get_param: MetricsQdrUsername
|
||||||
tripleo::profile::base::metrics::collectd::amqp_password:
|
tripleo::profile::base::metrics::collectd::amqp_password:
|
||||||
get_param: MetricsQdrPassword
|
get_param: MetricsQdrPassword
|
||||||
- tripleo::profile::base::metrics::collectd::amqp_host:
|
|
||||||
get_param: CollectdAmqpHost
|
|
||||||
tripleo::profile::base::metrics::collectd::amqp_port:
|
|
||||||
get_param: CollectdAmqpPort
|
|
||||||
tripleo::profile::base::metrics::collectd::amqp_user:
|
|
||||||
get_param: CollectdAmqpUser
|
|
||||||
tripleo::profile::base::metrics::collectd::amqp_password:
|
|
||||||
get_param: CollectdAmqpPassword
|
|
||||||
- {}
|
|
||||||
- if: # Collectd connected to external collectd instance
|
- if: # Collectd connected to external collectd instance
|
||||||
- collectd_connection
|
- collectd_connection
|
||||||
- tripleo::profile::base::metrics::collectd::collectd_server:
|
- tripleo::profile::base::metrics::collectd::collectd_server:
|
||||||
|
@ -548,17 +534,14 @@ outputs:
|
||||||
get_param: CollectdPassword
|
get_param: CollectdPassword
|
||||||
tripleo::profile::base::metrics::collectd::collectd_securitylevel:
|
tripleo::profile::base::metrics::collectd::collectd_securitylevel:
|
||||||
get_param: CollectdSecurityLevel
|
get_param: CollectdSecurityLevel
|
||||||
- {}
|
|
||||||
- if:
|
- if:
|
||||||
- enable_sqlalchemy_collectd
|
- {get_param: EnableSQLAlchemyCollectd}
|
||||||
- map_merge:
|
- tripleo::profile::base::metrics::collectd::enable_sqlalchemy_collectd:
|
||||||
- tripleo::profile::base::metrics::collectd::enable_sqlalchemy_collectd:
|
|
||||||
true
|
true
|
||||||
- tripleo::profile::base::metrics::collectd::sqlalchemy_collectd_bind_host:
|
tripleo::profile::base::metrics::collectd::sqlalchemy_collectd_bind_host:
|
||||||
get_param: CollectdSQLAlchemyBindHost
|
get_param: CollectdSQLAlchemyBindHost
|
||||||
- tripleo::profile::base::metrics::collectd::sqlalchemy_collectd_log_messages:
|
tripleo::profile::base::metrics::collectd::sqlalchemy_collectd_log_messages:
|
||||||
get_param: CollectdSQLAlchemyLogMessages
|
get_param: CollectdSQLAlchemyLogMessages
|
||||||
- {}
|
|
||||||
- if: # Collectd connected directly to Gnocchi DB
|
- if: # Collectd connected directly to Gnocchi DB
|
||||||
- gnocchi_connection
|
- gnocchi_connection
|
||||||
- map_merge:
|
- map_merge:
|
||||||
|
@ -618,15 +601,13 @@ outputs:
|
||||||
get_param: CollectdGnocchiKeystoneInterface
|
get_param: CollectdGnocchiKeystoneInterface
|
||||||
tripleo::profile::base::metrics::collectd::gnocchi_keystone_endpoint:
|
tripleo::profile::base::metrics::collectd::gnocchi_keystone_endpoint:
|
||||||
get_param: CollectdGnocchiKeystoneEndpoint
|
get_param: CollectdGnocchiKeystoneEndpoint
|
||||||
- {}
|
|
||||||
- if: # Collectd should run collectd-sensubility via collectd-exec
|
- if: # Collectd should run collectd-sensubility via collectd-exec
|
||||||
- enable_sensubility
|
- {get_param: CollectdEnableSensubility}
|
||||||
- map_merge:
|
- map_merge:
|
||||||
- if:
|
- if:
|
||||||
- sensubility_needs_sudo
|
- sensubility_needs_sudo
|
||||||
- tripleo::profile::base::metrics::collectd::sensubility::exec_sudo_rule:
|
- tripleo::profile::base::metrics::collectd::sensubility::exec_sudo_rule:
|
||||||
get_param: CollectdSensubilityExecSudoRule
|
get_param: CollectdSensubilityExecSudoRule
|
||||||
- {}
|
|
||||||
- tripleo::profile::base::metrics::collectd::enable_sensubility:
|
- tripleo::profile::base::metrics::collectd::enable_sensubility:
|
||||||
get_param: CollectdEnableSensubility
|
get_param: CollectdEnableSensubility
|
||||||
tripleo::profile::base::metrics::collectd::sensubility::connection:
|
tripleo::profile::base::metrics::collectd::sensubility::connection:
|
||||||
|
@ -679,12 +660,10 @@ outputs:
|
||||||
get_param: CollectdSensubilityTransport
|
get_param: CollectdSensubilityTransport
|
||||||
tripleo::profile::base::metrics::collectd::sensubility::amqp_port:
|
tripleo::profile::base::metrics::collectd::sensubility::amqp_port:
|
||||||
get_param: CollectdAmqpPort
|
get_param: CollectdAmqpPort
|
||||||
- {}
|
|
||||||
- if:
|
- if:
|
||||||
- enable_libpodstats
|
- {get_param: CollectdEnableLibpodstats}
|
||||||
- tripleo::profile::base::metrics::collectd::enable_libpodstats:
|
- tripleo::profile::base::metrics::collectd::enable_libpodstats:
|
||||||
get_param: CollectdEnableLibpodstats
|
get_param: CollectdEnableLibpodstats
|
||||||
- {}
|
|
||||||
service_config_settings: {}
|
service_config_settings: {}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
|
|
|
@ -155,10 +155,8 @@ parameters:
|
||||||
|
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
|
||||||
role_specific_required: {not: {equals: [{ get_param: [RoleParameters, MetricsQdrVars] }, ""]}}
|
role_specific_required: {not: {equals: [{ get_param: [RoleParameters, MetricsQdrVars] }, ""]}}
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
@ -205,10 +203,10 @@ resources:
|
||||||
# [2] https://github.com/openstack/puppet-qdr/search?q=listener_trusted_certs
|
# [2] https://github.com/openstack/puppet-qdr/search?q=listener_trusted_certs
|
||||||
tripleo_metrics_qdr_listener_trusted_certs: { get_param: MetricsQdrTrustedCerts }
|
tripleo_metrics_qdr_listener_trusted_certs: { get_param: MetricsQdrTrustedCerts }
|
||||||
######
|
######
|
||||||
- { get_param: MetricsQdrVars }
|
- {get_param: MetricsQdrVars}
|
||||||
- if:
|
- if:
|
||||||
- role_specific_required
|
- role_specific_required
|
||||||
- { get_param: [RoleParameters, MetricsQdrVars] }
|
- {get_param: [RoleParameters, MetricsQdrVars]}
|
||||||
- {}
|
- {}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
@ -230,16 +228,13 @@ outputs:
|
||||||
dport:
|
dport:
|
||||||
- 5667
|
- 5667
|
||||||
- 5668
|
- 5668
|
||||||
|
|
||||||
# For sensu
|
# For sensu
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
|
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
|
||||||
|
|
||||||
# See https://docs.openstack.org/tripleo-docs/latest/developer/tht_walkthrough/tls_for_services.html
|
# See https://docs.openstack.org/tripleo-docs/latest/developer/tht_walkthrough/tls_for_services.html
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
if:
|
if:
|
||||||
- internal_tls_enabled
|
- {get_param: EnableInternalTLS}
|
||||||
-
|
- - service: metrics_qdr
|
||||||
- service: metrics_qdr
|
|
||||||
network:
|
network:
|
||||||
get_param:
|
get_param:
|
||||||
- ServiceNetMap
|
- ServiceNetMap
|
||||||
|
@ -248,8 +243,6 @@ outputs:
|
||||||
params:
|
params:
|
||||||
ROLENAME: {get_param: RoleName}
|
ROLENAME: {get_param: RoleName}
|
||||||
type: node
|
type: node
|
||||||
- null
|
|
||||||
|
|
||||||
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
|
||||||
|
@ -276,17 +269,15 @@ outputs:
|
||||||
- optional: true
|
- optional: true
|
||||||
owner: qdrouterd:qdrouterd
|
owner: qdrouterd:qdrouterd
|
||||||
path: /etc/pki/tls/private/metrics_qdr.key
|
path: /etc/pki/tls/private/metrics_qdr.key
|
||||||
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
rsyslog:
|
rsyslog:
|
||||||
tripleo_logging_sources_metrics_qdr:
|
tripleo_logging_sources_metrics_qdr:
|
||||||
- {get_param: MetricsQdrLoggingSource}
|
- {get_param: MetricsQdrLoggingSource}
|
||||||
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- tripleo::haproxy::metrics_qdr: {get_param: MetricsQdrExternalEndpoint}
|
- tripleo::haproxy::metrics_qdr: {get_param: MetricsQdrExternalEndpoint}
|
||||||
- if:
|
- if:
|
||||||
- internal_tls_enabled
|
- {get_param: EnableInternalTLS}
|
||||||
- generate_service_certificates: true
|
- generate_service_certificates: true
|
||||||
# These two are used here: https://review.opendev.org/plugins/gitiles/openstack/puppet-tripleo/+/refs/heads/master/files/certmonger-metrics-qdr-refresh.sh#8
|
# These two are used here: https://review.opendev.org/plugins/gitiles/openstack/puppet-tripleo/+/refs/heads/master/files/certmonger-metrics-qdr-refresh.sh#8
|
||||||
tripleo::metrics::qdr::service_certificate: { get_param: MetricsQdrSslCertFile }
|
tripleo::metrics::qdr::service_certificate: { get_param: MetricsQdrSslCertFile }
|
||||||
|
@ -318,7 +309,6 @@ outputs:
|
||||||
template: "ROLENAMEMetricsQdrNetwork"
|
template: "ROLENAMEMetricsQdrNetwork"
|
||||||
params:
|
params:
|
||||||
ROLENAME: {get_param: RoleName}
|
ROLENAME: {get_param: RoleName}
|
||||||
- # Empty then
|
|
||||||
docker_config:
|
docker_config:
|
||||||
step_1:
|
step_1:
|
||||||
metrics_qdr:
|
metrics_qdr:
|
||||||
|
@ -343,11 +333,9 @@ outputs:
|
||||||
- /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
|
- {get_param: EnableInternalTLS}
|
||||||
- - /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
|
||||||
- /etc/pki/tls/private/metrics_qdr.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/metrics_qdr.key:ro
|
- /etc/pki/tls/private/metrics_qdr.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/metrics_qdr.key:ro
|
||||||
- null
|
|
||||||
|
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: Create required host directories for QDR
|
- name: Create required host directories for QDR
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -153,17 +153,13 @@ parameters:
|
||||||
certificate for this service
|
certificate for this service
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
key_size_override_set:
|
||||||
listener_ssl_enabled: {equals: [{get_param: MetricsQdrUseSSL}, true]}
|
not: {equals: [{get_param: QdrCertificateKeySize}, '']}
|
||||||
enable_stf: {equals: [{get_param: EnableSTF}, true]}
|
|
||||||
key_size_override_unset: {equals: [{get_param: QdrCertificateKeySize}, '']}
|
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the metrics Qdr role.
|
description: Role data for the metrics Qdr role.
|
||||||
|
@ -210,11 +206,7 @@ outputs:
|
||||||
tripleo::profile::base::metrics::qdr::addresses: {get_param: MetricsQdrAddresses}
|
tripleo::profile::base::metrics::qdr::addresses: {get_param: MetricsQdrAddresses}
|
||||||
tripleo::profile::base::metrics::qdr::autolink_addresses: {get_param: MetricsQdrAutoLinks}
|
tripleo::profile::base::metrics::qdr::autolink_addresses: {get_param: MetricsQdrAutoLinks}
|
||||||
# ssl support
|
# ssl support
|
||||||
tripleo::profile::base::metrics::qdr::listener_require_ssl:
|
tripleo::profile::base::metrics::qdr::listener_require_ssl: {get_param: MetricsQdrUseSSL}
|
||||||
if:
|
|
||||||
- listener_ssl_enabled
|
|
||||||
- true
|
|
||||||
- false
|
|
||||||
tripleo::profile::base::metrics::qdr::listener_require_encrypt: {get_param: MetricsQdrUseEncryption}
|
tripleo::profile::base::metrics::qdr::listener_require_encrypt: {get_param: MetricsQdrUseEncryption}
|
||||||
tripleo::profile::base::metrics::qdr::listener_sasl_mech: {get_param: MetricsQdrSaslMechanisms}
|
tripleo::profile::base::metrics::qdr::listener_sasl_mech: {get_param: MetricsQdrSaslMechanisms}
|
||||||
tripleo::profile::base::metrics::qdr::listener_ssl_cert_db: {get_param: MetricsQdrSslCertDb}
|
tripleo::profile::base::metrics::qdr::listener_ssl_cert_db: {get_param: MetricsQdrSslCertDb}
|
||||||
|
@ -226,27 +218,24 @@ outputs:
|
||||||
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:
|
tripleo::profile::base::metrics::qdr::ssl_profiles:
|
||||||
- internal_tls_enabled
|
if:
|
||||||
-
|
- {get_param: EnableInternalTLS}
|
||||||
tripleo::profile::base::metrics::qdr::ssl_profiles:
|
- list_concat:
|
||||||
list_concat:
|
|
||||||
- get_param: MetricsQdrSSLProfiles
|
- get_param: MetricsQdrSSLProfiles
|
||||||
- - name: 'tlsProfile'
|
- - name: 'tlsProfile'
|
||||||
certFile: '/etc/pki/tls/certs/metrics_qdr.crt'
|
certFile: '/etc/pki/tls/certs/metrics_qdr.crt'
|
||||||
keyFile: '/etc/pki/tls/private/metrics_qdr.key'
|
keyFile: '/etc/pki/tls/private/metrics_qdr.key'
|
||||||
caCertFile: {get_param: InternalTLSCAFile}
|
caCertFile: {get_param: InternalTLSCAFile}
|
||||||
- tripleo::profile::base::metrics::qdr::ssl_profiles: {get_param: MetricsQdrSSLProfiles}
|
- {get_param: MetricsQdrSSLProfiles}
|
||||||
- if:
|
- if:
|
||||||
- enable_stf
|
- {get_param: EnableSTF}
|
||||||
- tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
|
- tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
|
||||||
tripleo::profile::base::metrics::qdr::router_mode: edge
|
tripleo::profile::base::metrics::qdr::router_mode: edge
|
||||||
- null
|
|
||||||
metadata_settings:
|
metadata_settings:
|
||||||
if:
|
if:
|
||||||
- internal_tls_enabled
|
- {get_param: EnableInternalTLS}
|
||||||
-
|
- - service: metrics_qdr
|
||||||
- service: metrics_qdr
|
|
||||||
network:
|
network:
|
||||||
get_param:
|
get_param:
|
||||||
- ServiceNetMap
|
- ServiceNetMap
|
||||||
|
@ -255,7 +244,6 @@ outputs:
|
||||||
params:
|
params:
|
||||||
ROLENAME: {get_param: RoleName}
|
ROLENAME: {get_param: RoleName}
|
||||||
type: node
|
type: node
|
||||||
- null
|
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: metrics_qdr
|
config_volume: metrics_qdr
|
||||||
|
@ -315,10 +303,9 @@ outputs:
|
||||||
- /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
|
- {get_param: EnableInternalTLS}
|
||||||
- - /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
|
||||||
- /etc/pki/tls/private/metrics_qdr.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/metrics_qdr.key:ro
|
- /etc/pki/tls/private/metrics_qdr.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/metrics_qdr.key:ro
|
||||||
- null
|
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
deploy_steps_tasks:
|
deploy_steps_tasks:
|
||||||
|
@ -369,9 +356,9 @@ outputs:
|
||||||
{{container_cli}} restart "$container_name"
|
{{container_cli}} restart "$container_name"
|
||||||
key_size:
|
key_size:
|
||||||
if:
|
if:
|
||||||
- key_size_override_unset
|
- key_size_override_set
|
||||||
- {get_param: CertificateKeySize}
|
|
||||||
- {get_param: QdrCertificateKeySize}
|
- {get_param: QdrCertificateKeySize}
|
||||||
|
- {get_param: CertificateKeySize}
|
||||||
ca: ipa
|
ca: ipa
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: create persistent logs directory
|
- name: create persistent logs directory
|
||||||
|
|
|
@ -94,8 +94,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
- - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
- /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
|
|
||||||
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
|
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
|
||||||
- /dev/:/dev/
|
- /dev/:/dev/
|
||||||
- /run/:/run/
|
- /run/:/run/
|
||||||
|
|
Loading…
Reference in New Issue