logging: use service_config_settings for fluentd
The initial fluentd client implementation predates the introduction of service_config_settings, and necessitated some invasive changes to what is now common/serivces.yaml. This commit modifies existing services to use the service_config_settings based configuration mechanism supported by more recent versions of the fluentd support in puppet-tripleo. Partial-bug: #1715187 Depends-On: I3149902401d68d6fd236073a73a20f982d4b952a Depends-On: I2b057190ec0e4e75ee4ee47ebe0164c2644e5ab7 Depends-On: Ie7df4b8b94cb0ae38096ab95800f211ef1cd8455 Change-Id: I28028ffa00df2da8e0478a551d3de89c3ee46e1f
This commit is contained in:
parent
16e15b73b9
commit
b20bce1bf0
|
@ -20,6 +20,7 @@ resource_registry:
|
||||||
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
|
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
|
||||||
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
|
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
|
||||||
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
|
||||||
|
#Needs to run scenario001
|
||||||
OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml
|
OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml
|
||||||
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
|
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
|
||||||
# Some infra instances don't pass the ping test but are otherwise working.
|
# Some infra instances don't pass the ping test but are otherwise working.
|
||||||
|
|
|
@ -60,16 +60,20 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: ceilometer_agent_central
|
service_name: ceilometer_agent_central
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCentral}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCentral}
|
||||||
logging_source: {get_param: CeilometerAgentCentralLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- ceilometer
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
||||||
- ceilometer_redis_password: {get_param: RedisPassword}
|
- ceilometer_redis_password: {get_param: RedisPassword}
|
||||||
central_namespace: true
|
central_namespace: true
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
map_merge:
|
||||||
|
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
||||||
|
- fluentd:
|
||||||
|
tripleo_fluentd_groups_ceilometer_agent_central:
|
||||||
|
- ceilometer
|
||||||
|
tripleo_fluentd_sources_ceilometer_agent_central:
|
||||||
|
- {get_param: CeilometerAgentCentralLoggingSource}
|
||||||
|
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceilometer::agent::polling
|
include ::tripleo::profile::base::ceilometer::agent::polling
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -60,14 +60,17 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: ceilometer_agent_ipmi
|
service_name: ceilometer_agent_ipmi
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerIpmi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerIpmi}
|
||||||
logging_source: {get_param: CeilometerAgentIpmiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- ceilometer
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
- get_attr: [CeilometerServiceBase, role_data, config_settings]
|
||||||
- ceilometer_redis_password: {get_param: RedisPassword}
|
- ceilometer_redis_password: {get_param: RedisPassword}
|
||||||
ipmi_namespace: true
|
ipmi_namespace: true
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_ceilometer_agent_ipmi:
|
||||||
|
- ceilometer
|
||||||
|
tripleo_fluentd_sources_ceilometer_agent_ipmi:
|
||||||
|
- {get_param: CeilometerAgentIpmiLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceilometer::agent::polling
|
include ::tripleo::profile::base::ceilometer::agent::polling
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -39,7 +39,6 @@ parameters:
|
||||||
tag: openstack.ceilometer.agent.notification
|
tag: openstack.ceilometer.agent.notification
|
||||||
path: /var/log/ceilometer/agent-notification.log
|
path: /var/log/ceilometer/agent-notification.log
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
CeilometerServiceBase:
|
CeilometerServiceBase:
|
||||||
type: ./ceilometer-base.yaml
|
type: ./ceilometer-base.yaml
|
||||||
|
@ -57,13 +56,16 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: ceilometer_agent_notification
|
service_name: ceilometer_agent_notification
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerNotification}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerNotification}
|
||||||
logging_source: {get_param: CeilometerAgentNotificationLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- ceilometer
|
|
||||||
config_settings:
|
config_settings:
|
||||||
get_attr: [CeilometerServiceBase, role_data, config_settings]
|
get_attr: [CeilometerServiceBase, role_data, config_settings]
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
map_merge:
|
||||||
|
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
||||||
|
- fluentd:
|
||||||
|
tripleo_fluentd_groups_ceilometer_agent_notification:
|
||||||
|
- ceilometer
|
||||||
|
tripleo_fluentd_sources_ceilometer_agent_notification:
|
||||||
|
- {get_param: CeilometerAgentNotificationLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceilometer::agent::notification
|
include ::tripleo::profile::base::ceilometer::agent::notification
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -103,9 +103,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: cinder_api
|
service_name: cinder_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCinderApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCinderApi}
|
||||||
logging_source: {get_param: CinderApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- cinder
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CinderBase, role_data, config_settings]
|
- get_attr: [CinderBase, role_data, config_settings]
|
||||||
|
@ -160,6 +157,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::cinder::api
|
include ::tripleo::profile::base::cinder::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_cinder_api:
|
||||||
|
- cinder
|
||||||
|
tripleo_fluentd_sources_cinder_api:
|
||||||
|
- {get_param: CinderApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
cinder::keystone::auth::tenant: 'service'
|
cinder::keystone::auth::tenant: 'service'
|
||||||
cinder::keystone::auth::public_url: {get_param: [EndpointMap, CinderPublic, uri]}
|
cinder::keystone::auth::public_url: {get_param: [EndpointMap, CinderPublic, uri]}
|
||||||
|
|
|
@ -57,13 +57,16 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: cinder_scheduler
|
service_name: cinder_scheduler
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCinderScheduler}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCinderScheduler}
|
||||||
logging_source: {get_param: CinderSchedulerLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- cinder
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CinderBase, role_data, config_settings]
|
- get_attr: [CinderBase, role_data, config_settings]
|
||||||
- cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
|
- cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_cinder_scheduler:
|
||||||
|
- cinder
|
||||||
|
tripleo_fluentd_sources_cinder_scheduler:
|
||||||
|
- {get_param: CinderSchedulerLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::cinder::scheduler
|
include ::tripleo::profile::base::cinder::scheduler
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -121,9 +121,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: cinder_volume
|
service_name: cinder_volume
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionCinderVolume}
|
monitoring_subscription: {get_param: MonitoringSubscriptionCinderVolume}
|
||||||
logging_source: {get_param: CinderVolumeLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- cinder
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CinderBase, role_data, config_settings]
|
- get_attr: [CinderBase, role_data, config_settings]
|
||||||
|
@ -149,6 +146,12 @@ outputs:
|
||||||
# internal_api_uri -> [IP]
|
# internal_api_uri -> [IP]
|
||||||
# internal_api_subnet - > IP/CIDR
|
# internal_api_subnet - > IP/CIDR
|
||||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
|
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_cinder_volume:
|
||||||
|
- cinder
|
||||||
|
tripleo_fluentd_sources_cinder_volume:
|
||||||
|
- {get_param: CinderVolumeLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::cinder::volume
|
include ::tripleo::profile::base::cinder::volume
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -31,10 +31,6 @@ parameters:
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
MongodbMemoryLimit:
|
|
||||||
default: '20G'
|
|
||||||
description: Limit the amount of memory mongodb uses with systemd.
|
|
||||||
type: string
|
|
||||||
MongoDbLoggingSource:
|
MongoDbLoggingSource:
|
||||||
type: json
|
type: json
|
||||||
description: Fluentd logging configuration for mongodb.
|
description: Fluentd logging configuration for mongodb.
|
||||||
|
@ -44,6 +40,10 @@ parameters:
|
||||||
format: >-
|
format: >-
|
||||||
/(?<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+\+\d{4})
|
/(?<time>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d+\+\d{4})
|
||||||
(?<message>.*)$/
|
(?<message>.*)$/
|
||||||
|
MongodbMemoryLimit:
|
||||||
|
default: '20G'
|
||||||
|
description: Limit the amount of memory mongodb uses with systemd.
|
||||||
|
type: string
|
||||||
EnableInternalTLS:
|
EnableInternalTLS:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
@ -73,9 +73,6 @@ outputs:
|
||||||
description: Service mongodb using composable services.
|
description: Service mongodb using composable services.
|
||||||
value:
|
value:
|
||||||
service_name: mongodb
|
service_name: mongodb
|
||||||
logging_groups:
|
|
||||||
- mongodb
|
|
||||||
logging_source: {get_param: MongoDbLoggingSource}
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [MongoDbBase, role_data, config_settings]
|
- get_attr: [MongoDbBase, role_data, config_settings]
|
||||||
|
@ -123,6 +120,12 @@ outputs:
|
||||||
params:
|
params:
|
||||||
NETWORK: {get_param: [ServiceNetMap, MongodbNetwork]}
|
NETWORK: {get_param: [ServiceNetMap, MongodbNetwork]}
|
||||||
- {}
|
- {}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_mongodb:
|
||||||
|
- mongodb
|
||||||
|
tripleo_fluentd_sources_mongodb:
|
||||||
|
- {get_param: MongoDbLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::database::mongodb
|
include ::tripleo::profile::base::database::mongodb
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -96,9 +96,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: ec2_api
|
service_name: ec2_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionEc2Api}
|
monitoring_subscription: {get_param: MonitoringSubscriptionEc2Api}
|
||||||
logging_source: {get_param: Ec2ApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [TLSProxyBase, role_data, config_settings]
|
- get_attr: [TLSProxyBase, role_data, config_settings]
|
||||||
|
@ -179,6 +176,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::ec2api
|
include tripleo::profile::base::nova::ec2api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_ec2_api:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_ec2_api:
|
||||||
|
- {get_param: Ec2ApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
ec2api::keystone::auth::tenant: 'service'
|
ec2api::keystone::auth::tenant: 'service'
|
||||||
ec2api::keystone::auth::public_url: {get_param: [EndpointMap, Ec2ApiPublic, uri]}
|
ec2api::keystone::auth::public_url: {get_param: [EndpointMap, Ec2ApiPublic, uri]}
|
||||||
|
|
|
@ -179,9 +179,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: glance_api
|
service_name: glance_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionGlanceApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionGlanceApi}
|
||||||
logging_source: {get_param: GlanceApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- glance
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [TLSProxyBase, role_data, config_settings]
|
- get_attr: [TLSProxyBase, role_data, config_settings]
|
||||||
|
@ -268,6 +265,11 @@ outputs:
|
||||||
- {}
|
- {}
|
||||||
- glance::api::workers: {get_param: GlanceWorkers}
|
- glance::api::workers: {get_param: GlanceWorkers}
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_glance_api:
|
||||||
|
- glance
|
||||||
|
tripleo_fluentd_sources_glance_api:
|
||||||
|
- {get_param: GlanceApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]}
|
glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]}
|
||||||
glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
|
glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
|
||||||
|
|
|
@ -92,9 +92,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: gnocchi_api
|
service_name: gnocchi_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiApi}
|
||||||
logging_source: {get_param: GnocchiApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- gnocchi
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [ApacheServiceBase, role_data, config_settings]
|
- get_attr: [ApacheServiceBase, role_data, config_settings]
|
||||||
|
@ -133,6 +130,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::gnocchi::api
|
include ::tripleo::profile::base::gnocchi::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_gnocchi_api:
|
||||||
|
- gnocchi
|
||||||
|
tripleo_fluentd_sources_gnocchi_api:
|
||||||
|
- {get_param: GnocchiApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
|
gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
|
||||||
gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
|
gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
|
||||||
|
|
|
@ -86,9 +86,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: heat_api_cfn
|
service_name: heat_api_cfn
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionHeatApiCnf}
|
monitoring_subscription: {get_param: MonitoringSubscriptionHeatApiCnf}
|
||||||
logging_source: {get_param: HeatApiCfnLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- heat
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [HeatBase, role_data, config_settings]
|
- get_attr: [HeatBase, role_data, config_settings]
|
||||||
|
@ -121,6 +118,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::heat::api_cfn
|
include ::tripleo::profile::base::heat::api_cfn
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_heat_api_cfn:
|
||||||
|
- heat
|
||||||
|
tripleo_fluentd_sources_heat_api_cfn:
|
||||||
|
- {get_param: HeatApiCfnLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [HeatBase, role_data, service_config_settings, keystone]
|
- get_attr: [HeatBase, role_data, service_config_settings, keystone]
|
||||||
|
|
|
@ -92,9 +92,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: heat_api
|
service_name: heat_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionHeatApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionHeatApi}
|
||||||
logging_source: {get_param: HeatApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- heat
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [HeatBase, role_data, config_settings]
|
- get_attr: [HeatBase, role_data, config_settings]
|
||||||
|
@ -128,6 +125,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::heat::api
|
include ::tripleo::profile::base::heat::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_heat_api:
|
||||||
|
- heat
|
||||||
|
tripleo_fluentd_sources_heat_api:
|
||||||
|
- {get_param: HeatApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [HeatBase, role_data, service_config_settings, keystone]
|
- get_attr: [HeatBase, role_data, service_config_settings, keystone]
|
||||||
|
|
|
@ -89,9 +89,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: heat_engine
|
service_name: heat_engine
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
|
monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
|
||||||
logging_source: {get_param: HeatEngineLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- heat
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [HeatBase, role_data, config_settings]
|
- get_attr: [HeatBase, role_data, config_settings]
|
||||||
|
@ -144,6 +141,11 @@ outputs:
|
||||||
include ::tripleo::profile::base::heat::engine
|
include ::tripleo::profile::base::heat::engine
|
||||||
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_heat_engine:
|
||||||
|
- heat
|
||||||
|
tripleo_fluentd_sources_heat_engine:
|
||||||
|
- {get_param: HeatEngineLoggingSource}
|
||||||
mysql:
|
mysql:
|
||||||
heat::db::mysql::password: {get_param: HeatPassword}
|
heat::db::mysql::password: {get_param: HeatPassword}
|
||||||
heat::db::mysql::user: heat
|
heat::db::mysql::user: heat
|
||||||
|
|
|
@ -325,9 +325,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: keystone
|
service_name: keystone
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionKeystone}
|
monitoring_subscription: {get_param: MonitoringSubscriptionKeystone}
|
||||||
logging_source: {get_param: KeystoneLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- keystone
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [ApacheServiceBase, role_data, config_settings]
|
- get_attr: [ApacheServiceBase, role_data, config_settings]
|
||||||
|
@ -503,6 +500,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::keystone
|
include ::tripleo::profile::base::keystone
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_keystone:
|
||||||
|
- keystone
|
||||||
|
tripleo_fluentd_sources_keystone:
|
||||||
|
- {get_param: KeystoneLoggingSource}
|
||||||
mysql:
|
mysql:
|
||||||
keystone::db::mysql::password: {get_param: AdminToken}
|
keystone::db::mysql::password: {get_param: AdminToken}
|
||||||
keystone::db::mysql::user: keystone
|
keystone::db::mysql::user: keystone
|
||||||
|
|
|
@ -135,9 +135,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_api
|
service_name: neutron_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronServer}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronServer}
|
||||||
logging_source: {get_param: NeutronApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -205,6 +202,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::server
|
include tripleo::profile::base::neutron::server
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_api:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_api:
|
||||||
|
- {get_param: NeutronApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
neutron::keystone::auth::tenant: 'service'
|
neutron::keystone::auth::tenant: 'service'
|
||||||
neutron::keystone::auth::public_url: {get_param: [EndpointMap, NeutronPublic, uri]}
|
neutron::keystone::auth::public_url: {get_param: [EndpointMap, NeutronPublic, uri]}
|
||||||
|
|
|
@ -91,9 +91,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_dhcp
|
service_name: neutron_dhcp
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronDhcp}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronDhcp}
|
||||||
logging_source: {get_param: NeutronDhcpAgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -115,6 +112,12 @@ outputs:
|
||||||
proto: 'udp'
|
proto: 'udp'
|
||||||
chain: 'OUTPUT'
|
chain: 'OUTPUT'
|
||||||
dport: 68
|
dport: 68
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_dhcp:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_dhcp:
|
||||||
|
- {get_param: NeutronDhcpAgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::dhcp
|
include tripleo::profile::base::neutron::dhcp
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -83,9 +83,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_l2gw_agent
|
service_name: neutron_l2gw_agent
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL2gwAgent}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL2gwAgent}
|
||||||
logging_source: {get_param: NeutronL2gwAgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- neutron::agents::l2gw::ovsdb_hosts: {get_param: L2gwAgentOvsdbHosts}
|
- neutron::agents::l2gw::ovsdb_hosts: {get_param: L2gwAgentOvsdbHosts}
|
||||||
|
@ -108,6 +105,12 @@ outputs:
|
||||||
dport: {get_param: L2gwAgentManagerTableListeningPort}
|
dport: {get_param: L2gwAgentManagerTableListeningPort}
|
||||||
- null
|
- null
|
||||||
|
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_l2gw_agent:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_l2gw_agent:
|
||||||
|
- {get_param: NeutronL2gwAgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::agents::l2gw
|
include tripleo::profile::base::neutron::agents::l2gw
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -75,9 +75,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_l3_compute_dvr
|
service_name: neutron_l3_compute_dvr
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3Dvr}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3Dvr}
|
||||||
logging_source: {get_param: NeutronL3ComputeAgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -87,5 +84,11 @@ outputs:
|
||||||
- external_network_bridge_empty
|
- external_network_bridge_empty
|
||||||
- {}
|
- {}
|
||||||
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_l3_compute_dvr:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_l3_compute_dvr:
|
||||||
|
- {get_param: NeutronL3ComputeAgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::l3
|
include tripleo::profile::base::neutron::l3
|
||||||
|
|
|
@ -89,9 +89,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_l3
|
service_name: neutron_l3
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3}
|
||||||
logging_source: {get_param: NeutronL3AgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -109,6 +106,12 @@ outputs:
|
||||||
- external_network_bridge_empty
|
- external_network_bridge_empty
|
||||||
- {}
|
- {}
|
||||||
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_l3:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_l3:
|
||||||
|
- {get_param: NeutronL3AgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::l3
|
include tripleo::profile::base::neutron::l3
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -94,9 +94,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_metadata
|
service_name: neutron_metadata
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronMetadata}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronMetadata}
|
||||||
logging_source: {get_param: NeutronMetadataAgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -126,6 +123,12 @@ outputs:
|
||||||
- neutron_workers_unset
|
- neutron_workers_unset
|
||||||
- {}
|
- {}
|
||||||
- neutron::agents::metadata::metadata_workers: {get_param: NeutronWorkers}
|
- neutron::agents::metadata::metadata_workers: {get_param: NeutronWorkers}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_metadata:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_metadata:
|
||||||
|
- {get_param: NeutronMetadataAgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::neutron::metadata
|
include tripleo::profile::base::neutron::metadata
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -128,9 +128,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: neutron_ovs_agent
|
service_name: neutron_ovs_agent
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronOvs}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNeutronOvs}
|
||||||
logging_source: {get_param: NeutronOpenVswitchAgentLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- neutron
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NeutronBase, role_data, config_settings]
|
- get_attr: [NeutronBase, role_data, config_settings]
|
||||||
|
@ -158,6 +155,12 @@ outputs:
|
||||||
- no_firewall_driver
|
- no_firewall_driver
|
||||||
- {}
|
- {}
|
||||||
- neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
|
- neutron::agents::ml2::ovs::firewall_driver: {get_param: NeutronOVSFirewallDriver}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_neutron_ovs_agent:
|
||||||
|
- neutron
|
||||||
|
tripleo_fluentd_sources_neutron_ovs_agent:
|
||||||
|
- {get_param: NeutronOpenVswitchAgentLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::neutron::ovs
|
include ::tripleo::profile::base::neutron::ovs
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -111,9 +111,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_api
|
service_name: nova_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaApi}
|
||||||
logging_source: {get_param: NovaApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -170,6 +167,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::api
|
include tripleo::profile::base::nova::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_api:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_api:
|
||||||
|
- {get_param: NovaApiLoggingSource}
|
||||||
mysql:
|
mysql:
|
||||||
map_merge:
|
map_merge:
|
||||||
- {get_attr: [NovaBase, role_data, service_config_settings, mysql]}
|
- {get_attr: [NovaBase, role_data, service_config_settings, mysql]}
|
||||||
|
|
|
@ -153,9 +153,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_compute
|
service_name: nova_compute
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaCompute}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaCompute}
|
||||||
logging_source: {get_param: NovaComputeLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -217,6 +214,11 @@ outputs:
|
||||||
# Until then, just include it in the default nova-compute role.
|
# Until then, just include it in the default nova-compute role.
|
||||||
include tripleo::profile::base::nova::compute::libvirt
|
include tripleo::profile::base::nova::compute::libvirt
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_compute:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_compute:
|
||||||
|
- {get_param: NovaComputeLoggingSource}
|
||||||
collectd:
|
collectd:
|
||||||
tripleo.collectd.plugins.nova_compute:
|
tripleo.collectd.plugins.nova_compute:
|
||||||
- virt
|
- virt
|
||||||
|
|
|
@ -34,14 +34,14 @@ parameters:
|
||||||
default: 0
|
default: 0
|
||||||
description: Number of workers for Nova services.
|
description: Number of workers for Nova services.
|
||||||
type: number
|
type: number
|
||||||
MonitoringSubscriptionNovaConductor:
|
|
||||||
default: 'overcloud-nova-conductor'
|
|
||||||
type: string
|
|
||||||
NovaConductorLoggingSource:
|
NovaConductorLoggingSource:
|
||||||
type: json
|
type: json
|
||||||
default:
|
default:
|
||||||
tag: openstack.nova.conductor
|
tag: openstack.nova.conductor
|
||||||
path: /var/log/nova/nova-conductor.log
|
path: /var/log/nova/nova-conductor.log
|
||||||
|
MonitoringSubscriptionNovaConductor:
|
||||||
|
default: 'overcloud-nova-conductor'
|
||||||
|
type: string
|
||||||
UpgradeLevelNovaCompute:
|
UpgradeLevelNovaCompute:
|
||||||
type: string
|
type: string
|
||||||
description: Nova Compute upgrade level
|
description: Nova Compute upgrade level
|
||||||
|
@ -67,9 +67,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_conductor
|
service_name: nova_conductor
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaConductor}
|
||||||
logging_source: {get_param: NovaConductorLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -78,6 +75,12 @@ outputs:
|
||||||
- nova_workers_zero
|
- nova_workers_zero
|
||||||
- {}
|
- {}
|
||||||
- nova::conductor::workers: {get_param: NovaWorkers}
|
- nova::conductor::workers: {get_param: NovaWorkers}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_conductor:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_conductor:
|
||||||
|
- {get_param: NovaConductorLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::conductor
|
include tripleo::profile::base::nova::conductor
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -56,11 +56,14 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_consoleauth
|
service_name: nova_consoleauth
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaConsoleauth}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaConsoleauth}
|
||||||
logging_source: {get_param: NovaConsoleauthLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
get_attr: [NovaBase, role_data, config_settings]
|
get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_consoleauth:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_consoleauth:
|
||||||
|
- {get_param: NovaConsoleauthLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::consoleauth
|
include tripleo::profile::base::nova::consoleauth
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -85,9 +85,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_placement
|
service_name: nova_placement
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaPlacement}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaPlacement}
|
||||||
logging_source: {get_param: NovaPlacementLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -123,6 +120,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::placement
|
include tripleo::profile::base::nova::placement
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_placement:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_placement:
|
||||||
|
- {get_param: NovaPlacementLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
nova::keystone::auth_placement::tenant: 'service'
|
nova::keystone::auth_placement::tenant: 'service'
|
||||||
nova::keystone::auth_placement::public_url: {get_param: [EndpointMap, NovaPlacementPublic, uri]}
|
nova::keystone::auth_placement::public_url: {get_param: [EndpointMap, NovaPlacementPublic, uri]}
|
||||||
|
|
|
@ -83,9 +83,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_scheduler
|
service_name: nova_scheduler
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
|
||||||
logging_source: {get_param: NovaSchedulerLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -94,6 +91,12 @@ outputs:
|
||||||
nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
|
nova::scheduler::filter::scheduler_default_filters: {get_param: NovaSchedulerDefaultFilters}
|
||||||
nova::scheduler::filter::scheduler_max_attempts: {get_param: NovaSchedulerMaxAttempts}
|
nova::scheduler::filter::scheduler_max_attempts: {get_param: NovaSchedulerMaxAttempts}
|
||||||
nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
|
nova::scheduler::discover_hosts_in_cells_interval: {get_param: NovaSchedulerDiscoverHostsInCellsInterval}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_scheduler:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_scheduler:
|
||||||
|
- {get_param: NovaSchedulerLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::scheduler
|
include tripleo::profile::base::nova::scheduler
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -56,9 +56,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: nova_vnc_proxy
|
service_name: nova_vnc_proxy
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionNovaVNCProxy}
|
monitoring_subscription: {get_param: MonitoringSubscriptionNovaVNCProxy}
|
||||||
logging_source: {get_param: NovaVncproxyLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- nova
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [NovaBase, role_data, config_settings]
|
- get_attr: [NovaBase, role_data, config_settings]
|
||||||
|
@ -77,6 +74,12 @@ outputs:
|
||||||
dport:
|
dport:
|
||||||
- 6080
|
- 6080
|
||||||
- 13080
|
- 13080
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_nova_vnc_proxy:
|
||||||
|
- nova
|
||||||
|
tripleo_fluentd_sources_nova_vnc_proxy:
|
||||||
|
- {get_param: NovaVncproxyLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::nova::vncproxy
|
include tripleo::profile::base::nova::vncproxy
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -71,9 +71,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: octavia_api
|
service_name: octavia_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaApi}
|
||||||
logging_source: {get_param: OctaviaApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- octavia
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [OctaviaBase, role_data, config_settings]
|
- get_attr: [OctaviaBase, role_data, config_settings]
|
||||||
|
@ -102,6 +99,11 @@ outputs:
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::octavia::api
|
include tripleo::profile::base::octavia::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_octavia_api:
|
||||||
|
- octavia
|
||||||
|
tripleo_fluentd_sources_octavia_api:
|
||||||
|
- {get_param: OctaviaApiLoggingSource}
|
||||||
keystone:
|
keystone:
|
||||||
octavia::keystone::auth::tenant: 'service'
|
octavia::keystone::auth::tenant: 'service'
|
||||||
octavia::keystone::auth::public_url: {get_param: [EndpointMap, OctaviaPublic, uri]}
|
octavia::keystone::auth::public_url: {get_param: [EndpointMap, OctaviaPublic, uri]}
|
||||||
|
|
|
@ -61,14 +61,17 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: octavia_health_manager
|
service_name: octavia_health_manager
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaHealthManager}
|
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaHealthManager}
|
||||||
logging_source: {get_param: OctaviaHealthManagerLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- octavia
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [OctaviaBase, role_data, config_settings]
|
- get_attr: [OctaviaBase, role_data, config_settings]
|
||||||
- octavia::health_manager::heartbeat_key: {get_param: OctaviaHeartbeatKey}
|
- octavia::health_manager::heartbeat_key: {get_param: OctaviaHeartbeatKey}
|
||||||
octavia::health_manager::event_streamer_driver: 'queue_event_streamer'
|
octavia::health_manager::event_streamer_driver: 'queue_event_streamer'
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_octavia_health_manager:
|
||||||
|
- octavia
|
||||||
|
tripleo_fluentd_sources_octavia_health_manager:
|
||||||
|
- {get_param: OctaviaHealthManagerLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::octavia::health_manager
|
include tripleo::profile::base::octavia::health_manager
|
||||||
|
|
||||||
|
|
|
@ -68,9 +68,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: octavia_housekeeping
|
service_name: octavia_housekeeping
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaHousekeeping}
|
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaHousekeeping}
|
||||||
logging_source: {get_param: OctaviaHousekeepingLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- octavia
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [OctaviaBase, role_data, config_settings]
|
- get_attr: [OctaviaBase, role_data, config_settings]
|
||||||
|
@ -79,6 +76,12 @@ outputs:
|
||||||
- amphora_expiry_is_zero
|
- amphora_expiry_is_zero
|
||||||
- {}
|
- {}
|
||||||
- octavia::worker::amphora_expiry_age: {get_param: OctaviaAmphoraExpiryAge}
|
- octavia::worker::amphora_expiry_age: {get_param: OctaviaAmphoraExpiryAge}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_octavia_housekeeping:
|
||||||
|
- octavia
|
||||||
|
tripleo_fluentd_sources_octavia_housekeeping:
|
||||||
|
- {get_param: OctaviaHousekeepingLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::octavia::housekeeping
|
include tripleo::profile::base::octavia::housekeeping
|
||||||
|
|
||||||
|
|
|
@ -99,9 +99,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: octavia_worker
|
service_name: octavia_worker
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaWorker}
|
monitoring_subscription: {get_param: MonitoringSubscriptionOctaviaWorker}
|
||||||
logging_source: {get_param: OctaviaWorkerLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
-octavia
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [OctaviaBase, role_data, config_settings]
|
- get_attr: [OctaviaBase, role_data, config_settings]
|
||||||
|
@ -125,6 +122,12 @@ outputs:
|
||||||
- {}
|
- {}
|
||||||
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
|
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
|
||||||
|
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_octavia_worker:
|
||||||
|
- octavia
|
||||||
|
tripleo_fluentd_sources_octavia_worker:
|
||||||
|
- {get_param: OctaviaWorkerLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include tripleo::profile::base::octavia::worker
|
include tripleo::profile::base::octavia::worker
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,6 @@ parameters:
|
||||||
\[(?<pid>[^ ]*)\]
|
\[(?<pid>[^ ]*)\]
|
||||||
(?<host>[^ ]*)
|
(?<host>[^ ]*)
|
||||||
(?<message>.*)$/
|
(?<message>.*)$/
|
||||||
|
|
||||||
EnableLoadBalancer:
|
EnableLoadBalancer:
|
||||||
default: true
|
default: true
|
||||||
description: Whether to deploy a LoadBalancer on the Controller
|
description: Whether to deploy a LoadBalancer on the Controller
|
||||||
|
@ -111,9 +110,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: pacemaker
|
service_name: pacemaker
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionPacemaker}
|
monitoring_subscription: {get_param: MonitoringSubscriptionPacemaker}
|
||||||
logging_groups:
|
|
||||||
- haclient
|
|
||||||
logging_source: {get_param: PacemakerLoggingSource}
|
|
||||||
config_settings:
|
config_settings:
|
||||||
pacemaker::corosync::cluster_name: 'tripleo_cluster'
|
pacemaker::corosync::cluster_name: 'tripleo_cluster'
|
||||||
pacemaker::corosync::manage_fw: false
|
pacemaker::corosync::manage_fw: false
|
||||||
|
@ -142,6 +138,12 @@ outputs:
|
||||||
- {get_param: PcsdPassword}
|
- {get_param: PcsdPassword}
|
||||||
- {get_param: [DefaultPasswords, pcsd_password]}
|
- {get_param: [DefaultPasswords, pcsd_password]}
|
||||||
tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey}
|
tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_pacemaker:
|
||||||
|
- haclient
|
||||||
|
tripleo_fluentd_sources_pacemaker:
|
||||||
|
- {get_param: PacemakerLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::pacemaker
|
include ::tripleo::profile::base::pacemaker
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
|
@ -49,8 +49,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: cinder_volume
|
service_name: cinder_volume
|
||||||
monitoring_subscription: {get_attr: [CinderVolumeBase, role_data, monitoring_subscription]}
|
monitoring_subscription: {get_attr: [CinderVolumeBase, role_data, monitoring_subscription]}
|
||||||
logging_source: {get_attr: [CinderVolumeBase, role_data, logging_source]}
|
|
||||||
logging_groups: {get_attr: [CinderVolumeBase, role_data, logging_groups]}
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CinderVolumeBase, role_data, config_settings]
|
- get_attr: [CinderVolumeBase, role_data, config_settings]
|
||||||
|
|
|
@ -96,9 +96,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: pacemaker_remote
|
service_name: pacemaker_remote
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionPacemakerRemote}
|
monitoring_subscription: {get_param: MonitoringSubscriptionPacemakerRemote}
|
||||||
logging_groups:
|
|
||||||
- haclient
|
|
||||||
logging_source: {get_param: PacemakerRemoteLoggingSource}
|
|
||||||
config_settings:
|
config_settings:
|
||||||
tripleo.pacemaker_remote.firewall_rules:
|
tripleo.pacemaker_remote.firewall_rules:
|
||||||
'130 pacemaker_remote tcp':
|
'130 pacemaker_remote tcp':
|
||||||
|
@ -116,5 +113,11 @@ outputs:
|
||||||
passwords:
|
passwords:
|
||||||
- {get_param: PcsdPassword}
|
- {get_param: PcsdPassword}
|
||||||
- {get_param: [DefaultPasswords, pcsd_password]}
|
- {get_param: [DefaultPasswords, pcsd_password]}
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_pacemaker_remote:
|
||||||
|
- haclient
|
||||||
|
tripleo_fluentd_sources_pacemaker_remote:
|
||||||
|
- {get_param: PacemakerRemoteLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::pacemaker_remote
|
include ::tripleo::profile::base::pacemaker_remote
|
||||||
|
|
|
@ -74,9 +74,6 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: sahara_api
|
service_name: sahara_api
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi}
|
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi}
|
||||||
logging_source: {get_param: SaharaApiLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- sahara
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [SaharaBase, role_data, config_settings]
|
- get_attr: [SaharaBase, role_data, config_settings]
|
||||||
|
@ -94,6 +91,12 @@ outputs:
|
||||||
dport:
|
dport:
|
||||||
- 8386
|
- 8386
|
||||||
- 13386
|
- 13386
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_sahara_api:
|
||||||
|
- sahara
|
||||||
|
tripleo_fluentd_sources_sahara_api:
|
||||||
|
- {get_param: SaharaApiLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::sahara::api
|
include ::tripleo::profile::base::sahara::api
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
|
|
|
@ -56,12 +56,15 @@ outputs:
|
||||||
value:
|
value:
|
||||||
service_name: sahara_engine
|
service_name: sahara_engine
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
|
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
|
||||||
logging_source: {get_param: SaharaEngineLoggingSource}
|
|
||||||
logging_groups:
|
|
||||||
- sahara
|
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [SaharaBase, role_data, config_settings]
|
- get_attr: [SaharaBase, role_data, config_settings]
|
||||||
|
service_config_settings:
|
||||||
|
fluentd:
|
||||||
|
tripleo_fluentd_groups_sahara_engine:
|
||||||
|
- sahara
|
||||||
|
tripleo_fluentd_sources_sahara_engine:
|
||||||
|
- {get_param: SaharaEngineLoggingSource}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::sahara::engine
|
include ::tripleo::profile::base::sahara::engine
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
|
|
Loading…
Reference in New Issue