openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove references to logging_group"

Browse Source
This commit is contained in:
Zuul 2018-09-19 08:01:19 +00:00 committed by Gerrit Code Review
commit 85da81624f
112 changed files with 6 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/services.yaml
View File

@ -153,21 +153,6 @@ resources:
default_format: {get_attr: [LoggingConfiguration, LoggingDefaultFormat]}
pos_file_path: {get_attr: [LoggingConfiguration, LoggingPosFilePath]}
LoggingGroupsConfig:
type: OS::Heat::Value
properties:
type: comma_delimited_list
value:
# Build a list of unique groups to which we should add the
# fluentd user.
yaql:
expression: >
set((coalesce($.data.default, []) + coalesce($.data.extra, []) + coalesce($.data.role_data, []).where($ != null).select($.get('logging_groups'))).flatten()).where($)
data:
default: {get_attr: [LoggingConfiguration, LoggingDefaultGroups]}
extra: {get_attr: [LoggingConfiguration, LoggingExtraGroups]}
role_data: {get_attr: [ServiceChain, role_data]}
MonitoringSubscriptionsConfig:
type: OS::Heat::Value
properties:
@ -384,7 +369,6 @@ outputs:
service_names: {get_attr: [ServiceNames, value]}
monitoring_subscriptions: {get_attr: [MonitoringSubscriptionsConfig, value]}
logging_sources: {get_attr: [LoggingSourcesConfig, value]}
logging_groups: {get_attr: [LoggingGroupsConfig, value]}
config_settings:
yaql:
expression: $.data.where($ != null).reduce($1.mergeWith($2), {})

1
docker/services/aodh-api.yaml
View File

@ -75,7 +75,6 @@ outputs:
- get_attr: [AodhApiPuppetBase, role_data, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [AodhApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [AodhApiPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [AodhApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/aodh-evaluator.yaml
View File

@ -68,7 +68,6 @@ outputs:
map_merge:
- get_attr: [AodhEvaluatorBase, role_data, config_settings]
logging_source: {get_attr: [AodhEvaluatorBase, role_data, logging_source]}
logging_groups: {get_attr: [AodhEvaluatorBase, role_data, logging_groups]}
service_config_settings: {get_attr: [AodhEvaluatorBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/aodh-listener.yaml
View File

@ -68,7 +68,6 @@ outputs:
map_merge:
- get_attr: [AodhListenerBase, role_data, config_settings]
logging_source: {get_attr: [AodhListenerBase, role_data, logging_source]}
logging_groups: {get_attr: [AodhListenerBase, role_data, logging_groups]}
service_config_settings: {get_attr: [AodhListenerBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/aodh-notifier.yaml
View File

@ -68,7 +68,6 @@ outputs:
map_merge:
- get_attr: [AodhNotifierBase, role_data, config_settings]
logging_source: {get_attr: [AodhNotifierBase, role_data, logging_source]}
logging_groups: {get_attr: [AodhNotifierBase, role_data, logging_groups]}
service_config_settings: {get_attr: [AodhNotifierBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/barbican-api.yaml
View File

@ -87,7 +87,6 @@ outputs:
- get_attr: [BarbicanApiLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [BarbicanApiBase, role_data, logging_source]}
logging_groups: {get_attr: [BarbicanApiBase, role_data, logging_groups]}
service_config_settings: {get_attr: [BarbicanApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ceilometer-agent-central.yaml
View File

@ -68,7 +68,6 @@ outputs:
service_name: {get_attr: [CeilometerAgentCentralBase, role_data, service_name]}
config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, config_settings]}
logging_source: {get_attr: [CeilometerAgentCentralBase, role_data, logging_source]}
logging_groups: {get_attr: [CeilometerAgentCentralBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]

1
docker/services/ceilometer-agent-compute.yaml
View File

@ -63,7 +63,6 @@ outputs:
service_name: {get_attr: [CeilometerAgentComputeBase, role_data, service_name]}
config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
logging_source: {get_attr: [CeilometerAgentComputeBase, role_data, logging_source]}
logging_groups: {get_attr: [CeilometerAgentComputeBase, role_data, logging_groups]}
service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ceilometer-agent-ipmi.yaml
View File

@ -68,7 +68,6 @@ outputs:
service_name: {get_attr: [CeilometerAgentIpmiBase, role_data, service_name]}
config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, config_settings]}
logging_source: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_source]}
logging_groups: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]

1
docker/services/ceilometer-agent-notification.yaml
View File

@ -68,7 +68,6 @@ outputs:
service_name: {get_attr: [CeilometerAgentNotificationBase, role_data, service_name]}
config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings]}
logging_source: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_source]}
logging_groups: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]

1
docker/services/cinder-api.yaml
View File

@ -78,7 +78,6 @@ outputs:
service_name: {get_attr: [CinderBase, role_data, service_name]}
config_settings: {get_attr: [CinderBase, role_data, config_settings]}
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]

1
docker/services/cinder-backup.yaml
View File

@ -86,7 +86,6 @@ outputs:
service_name: {get_attr: [CinderBase, role_data, service_name]}
config_settings: {get_attr: [CinderBase, role_data, config_settings]}
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]

1
docker/services/cinder-scheduler.yaml
View File

@ -71,7 +71,6 @@ outputs:
service_name: {get_attr: [CinderBase, role_data, service_name]}
config_settings: {get_attr: [CinderBase, role_data, config_settings]}
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]

1
docker/services/cinder-volume.yaml
View File

@ -102,7 +102,6 @@ outputs:
- get_attr: [CinderBase, role_data, config_settings]
- tripleo::profile::base::lvm::enable_udev: false
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [CinderBase, role_data, service_config_settings]

1
docker/services/congress.yaml
View File

@ -68,7 +68,6 @@ outputs:
map_merge:
- get_attr: [CongressBase, role_data, config_settings]
logging_source: {get_attr: [CongressBase, role_data, logging_source]}
logging_groups: {get_attr: [CongressBase, role_data, logging_groups]}
service_config_settings: {get_attr: [CongressBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/database/mongodb.yaml
View File

@ -71,7 +71,6 @@ outputs:
- get_attr: [MongodbPuppetBase, role_data, config_settings]
- mongodb::server::fork: false
logging_source: {get_attr: [MongodbPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [MongodbPuppetBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS #
puppet_config:
config_volume: mongodb

1
docker/services/database/mysql.yaml
View File

@ -84,7 +84,6 @@ outputs:
mysqld_safe:
pid-file: /var/lib/mysql/mariadb.pid
logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS #
puppet_config:
config_volume: mysql

1
docker/services/database/redis.yaml
View File

@ -69,7 +69,6 @@ outputs:
tripleo::stunnel::manage_service: false
tripleo::stunnel::foreground: 'yes'
logging_source: {get_attr: [RedisBase, role_data, logging_source]}
logging_groups: {get_attr: [RedisBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-api.yaml
View File

@ -103,7 +103,6 @@ outputs:
- {}
- designate::api::workers: {get_param: DesignateWorkers}
logging_source: {get_attr: [DesignateApiBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateApiBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-central.yaml
View File

@ -76,7 +76,6 @@ outputs:
- get_attr: [DesignateBase, role_data, config_settings]
- get_attr: [DesignateCentralBase, role_data, config_settings]
logging_source: {get_attr: [DesignateCentralBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateCentralBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateCentralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-mdns.yaml
View File

@ -76,7 +76,6 @@ outputs:
- get_attr: [DesignateBase, role_data, config_settings]
- get_attr: [DesignateMDNSBase, role_data, config_settings]
logging_source: {get_attr: [DesignateMDNSBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateMDNSBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateMDNSBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-producer.yaml
View File

@ -78,7 +78,6 @@ outputs:
- get_attr: [DesignateBase, role_data, config_settings]
- get_attr: [DesignateProducerBase, role_data, config_settings]
logging_source: {get_attr: [DesignateProducerBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateProducerBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateProducerBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-sink.yaml
View File

@ -78,7 +78,6 @@ outputs:
- get_attr: [DesignateBase, role_data, config_settings]
- get_attr: [DesignateSinkBase, role_data, config_settings]
logging_source: {get_attr: [DesignateSinkBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateSinkBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateSinkBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/designate-worker.yaml
View File

@ -81,7 +81,6 @@ outputs:
- get_attr: [DesignateBase, role_data, config_settings]
- get_attr: [DesignateWorkerBase, role_data, config_settings]
logging_source: {get_attr: [DesignateWorkerBase, role_data, logging_source]}
logging_groups: {get_attr: [DesignateWorkerBase, role_data, logging_groups]}
service_config_settings: {get_attr: [DesignateWorkerBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ec2-api.yaml
View File

@ -73,7 +73,6 @@ outputs:
service_name: {get_attr: [Ec2ApiPuppetBase, role_data, service_name]}
config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [Ec2ApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [Ec2ApiPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [Ec2ApiPuppetBase, role_data, service_config_settings]

1
docker/services/etcd.yaml
View File

@ -58,7 +58,6 @@ outputs:
value:
service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
logging_source: {get_attr: [EtcdPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [EtcdPuppetBase, role_data, logging_groups]}
config_settings:
map_merge:
- {get_attr: [EtcdPuppetBase, role_data, config_settings]}

1
docker/services/glance-api.yaml
View File

@ -110,7 +110,6 @@ outputs:
- get_attr: [GlanceLogging, config_settings]
- glance::api::sync_db: false
logging_source: {get_attr: [GlanceApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [GlanceApiPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]

1
docker/services/gnocchi-api.yaml
View File

@ -94,7 +94,6 @@ outputs:
- get_attr: [GnocchiApiPuppetBase, role_data, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [GnocchiApiPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]

1
docker/services/gnocchi-metricd.yaml
View File

@ -79,7 +79,6 @@ outputs:
service_name: {get_attr: [GnocchiMetricdBase, role_data, service_name]}
config_settings: {get_attr: [GnocchiMetricdBase, role_data, config_settings]}
logging_source: {get_attr: [GnocchiMetricdBase, role_data, logging_source]}
logging_groups: {get_attr: [GnocchiMetricdBase, role_data, logging_groups]}
service_config_settings: {get_attr: [GnocchiMetricdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/gnocchi-statsd.yaml
View File

@ -79,7 +79,6 @@ outputs:
service_name: {get_attr: [GnocchiStatsdBase, role_data, service_name]}
config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
logging_source: {get_attr: [GnocchiStatsdBase, role_data, logging_source]}
logging_groups: {get_attr: [GnocchiStatsdBase, role_data, logging_groups]}
service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/haproxy.yaml
View File

@ -139,7 +139,6 @@ outputs:
# when this is updated
tripleo::haproxy::crl_file: null
logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/heat-api-cfn.yaml
View File

@ -79,7 +79,6 @@ outputs:
- get_attr: [HeatApiCfnLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [HeatBase, role_data, logging_source]}
logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [HeatBase, role_data, service_config_settings]

1
docker/services/heat-api.yaml
View File

@ -87,7 +87,6 @@ outputs:
- get_attr: [HeatApiLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [HeatBase, role_data, logging_source]}
logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [HeatBase, role_data, service_config_settings]

1
docker/services/heat-engine.yaml
View File

@ -81,7 +81,6 @@ outputs:
- get_attr: [HeatBase, role_data, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [HeatBase, role_data, logging_source]}
logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [HeatBase, role_data, service_config_settings]

1
docker/services/horizon.yaml
View File

@ -69,7 +69,6 @@ outputs:
- get_attr: [HorizonBase, role_data, config_settings]
- horizon::secure_cookies: false
logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}
service_config_settings: {get_attr: [HorizonBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ironic-api.yaml
View File

@ -69,7 +69,6 @@ outputs:
- get_attr: [IronicApiBase, role_data, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [IronicApiBase, role_data, logging_source]}
logging_groups: {get_attr: [IronicApiBase, role_data, logging_groups]}
service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ironic-conductor.yaml
View File

@ -84,7 +84,6 @@ outputs:
- ironic::pxe::http_root: /var/lib/ironic/httpboot
- ironic::conductor::http_root: /var/lib/ironic/httpboot
logging_source: {get_attr: [IronicConductorBase, role_data, logging_source]}
logging_groups: {get_attr: [IronicConductorBase, role_data, logging_groups]}
service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/iscsid.yaml
View File

@ -58,7 +58,6 @@ outputs:
service_name: {get_attr: [IscsidBase, role_data, service_name]}
config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
logging_source: {get_attr: [IscsidBase, role_data, logging_source]}
logging_groups: {get_attr: [IscsidBase, role_data, logging_groups]}
service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/keepalived.yaml
View File

@ -66,7 +66,6 @@ outputs:
- get_attr: [KeepalivedBase, role_data, config_settings]
- tripleo::keepalived:custom_vrrp_script: 'test -S /var/lib/haproxy/stats && echo "show info" | socat /var/lib/haproxy/stats stdio'
logging_source: {get_attr: [KeepalivedBase, role_data, logging_source]}
logging_groups: {get_attr: [KeepalivedBase, role_data, logging_groups]}
service_config_settings: {get_attr: [KeepalivedBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/keystone.yaml
View File

@ -95,7 +95,6 @@ outputs:
- get_attr: [KeystoneLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
logging_groups: {get_attr: [KeystoneBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [KeystoneBase, role_data, service_config_settings]

1
docker/services/manila-api.yaml
View File

@ -60,7 +60,6 @@ outputs:
service_name: {get_attr: [ManilaApiPuppetBase, role_data, service_name]}
config_settings: {get_attr: [ManilaApiPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [ManilaApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [ManilaApiPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [ManilaApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS #
puppet_config:

1
docker/services/manila-scheduler.yaml
View File

@ -60,7 +60,6 @@ outputs:
service_name: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_name]}
config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS #
puppet_config:

1
docker/services/manila-share.yaml
View File

@ -77,7 +77,6 @@ outputs:
service_name: {get_attr: [ManilaBase, role_data, service_name]}
config_settings: {get_attr: [ManilaBase, role_data, config_settings]}
logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/memcached.yaml
View File

@ -62,7 +62,6 @@ outputs:
- {get_attr: [MemcachedBase, role_data, config_settings]}
- memcached::logstdout: true
logging_source: {get_attr: [MemcachedBase, role_data, logging_source]}
logging_groups: {get_attr: [MemcachedBase, role_data, logging_groups]}
service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/messaging/notify-rabbitmq.yaml
View File

@ -84,7 +84,6 @@ outputs:
- tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
- {}
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/messaging/rpc-rabbitmq.yaml
View File

@ -84,7 +84,6 @@ outputs:
- tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
- {}
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/metrics/collectd.yaml
View File

@ -67,7 +67,6 @@ outputs:
- tripleo::profile::base::metrics::collectd::enable_file_logging: true
collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
logging_source: {get_attr: [CollectdBase, role_data, logging_source]}
logging_groups: {get_attr: [CollectdBase, role_data, logging_groups]}
service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/mistral-api.yaml
View File

@ -68,7 +68,6 @@ outputs:
map_merge:
- get_attr: [MistralApiBase, role_data, config_settings]
logging_source: {get_attr: [MistralApiBase, role_data, logging_source]}
logging_groups: {get_attr: [MistralApiBase, role_data, logging_groups]}
service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/mistral-engine.yaml
View File

@ -69,7 +69,6 @@ outputs:
map_merge:
- get_attr: [MistralBase, role_data, config_settings]
logging_source: {get_attr: [MistralBase, role_data, logging_source]}
logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/mistral-event-engine.yaml
View File

@ -69,7 +69,6 @@ outputs:
map_merge:
- get_attr: [MistralBase, role_data, config_settings]
logging_source: {get_attr: [MistralBase, role_data, logging_source]}
logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/mistral-executor.yaml
View File

@ -77,7 +77,6 @@ outputs:
map_merge:
- get_attr: [MistralBase, role_data, config_settings]
logging_source: {get_attr: [MistralBase, role_data, logging_source]}
logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/neutron-api.yaml
View File

@ -90,7 +90,6 @@ outputs:
value:
service_name: {get_attr: [NeutronBase, role_data, service_name]}
logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]

1
docker/services/neutron-dhcp.yaml
View File

@ -109,7 +109,6 @@ outputs:
tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/dhcp_haproxy_wrapper'
tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: DockerNeutronDHCPImage}
logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]

1
docker/services/neutron-l3.yaml
View File

@ -118,7 +118,6 @@ outputs:
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: DockerNeutronL3AgentImage}
logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NeutronL3Base, role_data, service_config_settings]

1
docker/services/neutron-metadata.yaml
View File

@ -72,7 +72,6 @@ outputs:
- get_attr: [NeutronMetadataBase, role_data, config_settings]
- get_attr: [NeutronLogging, config_settings]
logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NeutronMetadataBase, role_data, service_config_settings]

1
docker/services/neutron-ovs-agent.yaml
View File

@ -80,7 +80,6 @@ outputs:
- get_attr: [NeutronOvsAgentBase, role_data, config_settings]
- get_attr: [NeutronLogging, config_settings]
logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NeutronOvsAgentBase, role_data, service_config_settings]

2
docker/services/neutron-ovs-dpdk-agent.yaml
View File

@ -77,8 +77,6 @@ outputs:
get_attr: [NeutronOvsDpdkAgentBase, role_data, service_config_settings]
logging_source:
get_attr: [NeutronOvsAgentDockerBase, role_data, logging_source]
logging_groups:
get_attr: [NeutronOvsAgentDockerBase, role_data, logging_groups]
puppet_config:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2

1
docker/services/neutron-plugin-ml2-ansible.yaml
View File

@ -56,7 +56,6 @@ outputs:
service_name: {get_attr: [NeutronML2AnsibleBase, role_data, service_name]}
config_settings: {get_attr: [NeutronML2AnsibleBase, role_data, config_settings]}
logging_source: {get_attr: [NeutronML2AnsibleBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronML2AnsibleBase, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronML2AnsibleBase, role_data, service_config_settings]}
metadata_settings:
get_attr: [NeutronML2AnsibleBase, role_data, metadata_settings]

1
docker/services/neutron-plugin-ml2-cisco-vts.yaml
View File

@ -51,7 +51,6 @@ outputs:
service_name: {get_attr: [NeutronMl2VtsBase, role_data, service_name]}
config_settings: {get_attr: [NeutronMl2VtsBase, role_data, config_settings]}
logging_source: {get_attr: [NeutronMl2VtsBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronMl2VtsBase, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronMl2VtsBase, role_data, service_config_settings]}
metadata_settings:
get_attr: [NeutronMl2VtsBase, role_data, metadata_settings]

1
docker/services/neutron-plugin-ml2.yaml
View File

@ -58,7 +58,6 @@ outputs:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]

1
docker/services/nova-api.yaml
View File

@ -99,7 +99,6 @@ outputs:
- get_attr: [NovaApiLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [NovaApiBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaApiBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaApiBase, role_data, service_config_settings]

1
docker/services/nova-compute.yaml
View File

@ -133,7 +133,6 @@ outputs:
- get_attr: [NovaComputeBase, role_data, config_settings]
- get_attr: [NovaLogging, config_settings]
logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaComputeBase, role_data, service_config_settings]

1
docker/services/nova-conductor.yaml
View File

@ -85,7 +85,6 @@ outputs:
- {get_attr: [NovaConductorBase, role_data, config_settings]}
- {get_attr: [NovaLogging, config_settings]}
logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaConductorBase, role_data, service_config_settings]

1
docker/services/nova-consoleauth.yaml
View File

@ -80,7 +80,6 @@ outputs:
- {get_attr: [NovaConsoleauthPuppetBase, role_data, config_settings]}
- {get_attr: [NovaLogging, config_settings]}
logging_source: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaConsoleauthPuppetBase, role_data, service_config_settings]

1
docker/services/nova-ironic.yaml
View File

@ -77,7 +77,6 @@ outputs:
cellv2_discovery: true
config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}
puppet_config:
config_volume: nova
puppet_tags: nova_config,nova_paste_api_ini

1
docker/services/nova-libvirt.yaml
View File

@ -211,7 +211,6 @@ outputs:
- tripleo::profile::base::certmonger_user::libvirt_postsave_cmd: "true" # TODO: restart the libvirt container here
logging_source: {get_attr: [NovaLibvirtBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaLibvirtBase, role_data, logging_groups]}
puppet_config:
config_volume: nova_libvirt
puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password

1
docker/services/nova-metadata.yaml
View File

@ -73,7 +73,6 @@ outputs:
- get_attr: [NovaMetadataBase, role_data, config_settings]
- {get_attr: [NovaLogging, config_settings]}
logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaMetadataBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaMetadataBase, role_data, service_config_settings]

1
docker/services/nova-migration-target.yaml
View File

@ -107,7 +107,6 @@ outputs:
tripleo::profile::base::nova::migration::proxy::target_host: "%{hiera('live_migration_ssh_inbound_addr')}"
- {}
logging_source: {get_attr: [NovaMigrationTargetBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaMigrationTargetBase, role_data, logging_groups]}
puppet_config:
config_volume: nova_libvirt
step_config:

1
docker/services/nova-placement.yaml
View File

@ -85,7 +85,6 @@ outputs:
- get_attr: [NovaPlacementLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaPlacementBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaPlacementBase, role_data, service_config_settings]

1
docker/services/nova-scheduler.yaml
View File

@ -80,7 +80,6 @@ outputs:
- {get_attr: [NovaSchedulerBase, role_data, config_settings]}
- {get_attr: [NovaLogging, config_settings]}
logging_source: {get_attr: [NovaSchedulerBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaSchedulerBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaSchedulerBase, role_data, service_config_settings]

1
docker/services/nova-vnc-proxy.yaml
View File

@ -120,7 +120,6 @@ outputs:
- {get_attr: [NovaVncProxyPuppetBase, role_data, config_settings]}
- {get_attr: [NovaLogging, config_settings]}
logging_source: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [NovaVncProxyPuppetBase, role_data, service_config_settings]

1
docker/services/octavia-api.yaml
View File

@ -75,7 +75,6 @@ outputs:
service_name: {get_attr: [OctaviaApiPuppetBase, role_data, service_name]}
config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [OctaviaApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [OctaviaApiPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [OctaviaApiPuppetBase, role_data, service_config_settings]

1
docker/services/octavia-health-manager.yaml
View File

@ -68,7 +68,6 @@ outputs:
service_name: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_name]}
config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]

1
docker/services/octavia-housekeeping.yaml
View File

@ -64,7 +64,6 @@ outputs:
service_name: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_name]}
config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]

1
docker/services/octavia-worker.yaml
View File

@ -68,7 +68,6 @@ outputs:
service_name: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_name]}
config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]

1
docker/services/opendaylight-api.yaml
View File

@ -88,7 +88,6 @@ outputs:
- tripleo::certmonger::opendaylight::postsave_cmd: "true" # TODO: restart the odl container here
- {}
logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: opendaylight

1
docker/services/ovn-controller.yaml
View File

@ -61,7 +61,6 @@ outputs:
map_merge:
- get_attr: [OvnControllerBase, role_data, config_settings]
logging_source: {get_attr: [OvnControllerBase, role_data, logging_source]}
logging_groups: {get_attr: [OvnControllerBase, role_data, logging_groups]}
service_config_settings: {get_attr: [OvnControllerBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/ovn-dbs.yaml
View File

@ -64,7 +64,6 @@ outputs:
map_merge:
- get_attr: [OVNDbsBase, role_data, config_settings]
logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS
# puppet_config is not required for this service since we configure
# the NB and SB DB servers to listen on the proper IP address/port

1
docker/services/ovn-metadata.yaml
View File

@ -82,7 +82,6 @@ outputs:
tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/ovn_metadata_haproxy_wrapper'
tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::haproxy_image: {get_param: DockerOvnMetadataImage}
logging_source: {get_attr: [OVNMetadataBase, role_data, logging_source]}
logging_groups: {get_attr: [OVNMetadataBase, role_data, logging_groups]}
puppet_config:
puppet_tags: neutron_config,ovn_metadata_agent_config
config_volume: neutron

1
docker/services/pacemaker/cinder-backup.yaml
View File

@ -111,7 +111,6 @@ outputs:
cinder::backup::manage_service: false
cinder::backup::enabled: false
logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]}
service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/cinder-volume.yaml
View File

@ -107,7 +107,6 @@ outputs:
cinder::volume::enabled: false
cinder::backend_host: hostgroup
logging_source: {get_attr: [CinderBase, role_data, logging_source]}
logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/clustercheck.yaml
View File

@ -64,7 +64,6 @@ outputs:
service_name: clustercheck
config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]}
logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS #
puppet_config:
config_volume: clustercheck

1
docker/services/pacemaker/database/mysql.yaml
View File

@ -126,7 +126,6 @@ outputs:
get_param: InternalTLSCAFile
- {}
logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
# BEGIN DOCKER SETTINGS #
puppet_config:
config_volume: mysql

1
docker/services/pacemaker/database/redis.yaml
View File

@ -131,7 +131,6 @@ outputs:
- '127.0.0.1'
- {}
logging_source: {get_attr: [RedisBase, role_data, logging_source]}
logging_groups: {get_attr: [RedisBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/haproxy.yaml
View File

@ -147,7 +147,6 @@ outputs:
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/manila-share.yaml
View File

@ -97,7 +97,6 @@ outputs:
manila::share::enabled: false
manila::host: hostgroup
logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/notify-rabbitmq.yaml
View File

@ -100,7 +100,6 @@ outputs:
- 5672
- 25672
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/ovn-dbs.yaml
View File

@ -98,7 +98,6 @@ outputs:
- tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort}
- tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/rabbitmq.yaml
View File

@ -99,7 +99,6 @@ outputs:
- 5672
- 25672
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/pacemaker/rpc-rabbitmq.yaml
View File

@ -100,7 +100,6 @@ outputs:
- 5672
- 25672
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/panko-api.yaml
View File

@ -78,7 +78,6 @@ outputs:
- get_attr: [PankoApiLogging, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [PankoApiPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [PankoApiPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS #
puppet_config:

1
docker/services/rabbitmq.yaml
View File

@ -83,7 +83,6 @@ outputs:
- tripleo::certmonger::rabbitmq::postsave_cmd: "true" # TODO: restart the rabbitmq container here
- {}
logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/sahara-api.yaml
View File

@ -72,7 +72,6 @@ outputs:
- get_attr: [SaharaApiPuppetBase, role_data, config_settings]
- sahara::sync_db: false
logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [SaharaApiPuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]

1
docker/services/sahara-engine.yaml
View File

@ -72,7 +72,6 @@ outputs:
- get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
- sahara::sync_db: false
logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [SaharaEnginePuppetBase, role_data, logging_groups]}
service_config_settings:
map_merge:
- get_attr: [SaharaEnginePuppetBase, role_data, service_config_settings]

1
docker/services/swift-proxy.yaml
View File

@ -81,7 +81,6 @@ outputs:
service_name: {get_attr: [SwiftProxyBase, role_data, service_name]}
config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
logging_source: {get_attr: [SwiftProxyBase, role_data, logging_source]}
logging_groups: {get_attr: [SwiftProxyBase, role_data, logging_groups]}
service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/swift-ringbuilder.yaml
View File

@ -92,7 +92,6 @@ outputs:
- {get_attr: [SwiftRingbuilderBase, role_data, config_settings]}
- tripleo::profile::base::swift::ringbuilder:skip_consistency_check: true
logging_source: {get_attr: [SwiftRingbuilderBase, role_data, logging_source]}
logging_groups: {get_attr: [SwiftRingbuilderBase, role_data, logging_groups]}
service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/swift-storage.yaml
View File

@ -84,7 +84,6 @@ outputs:
# FIXME (cschwede): re-enable this once checks works inside containers
- swift::storage::all::mount_check: false
logging_source: {get_attr: [SwiftStorageBase, role_data, logging_source]}
logging_groups: {get_attr: [SwiftStorageBase, role_data, logging_groups]}
service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/tacker.yaml
View File

@ -64,7 +64,6 @@ outputs:
map_merge:
- get_attr: [TackerBase, role_data, config_settings]
logging_source: {get_attr: [TackerBase, role_data, logging_source]}
logging_groups: {get_attr: [TackerBase, role_data, logging_groups]}
service_config_settings: {get_attr: [TackerBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/tripleo-ui.yaml
View File

@ -77,7 +77,6 @@ outputs:
- get_attr: [TripleoUIPuppetBase, role_data, config_settings]
- apache::default_vhost: false
logging_source: {get_attr: [TripleoUIPuppetBase, role_data, logging_source]}
logging_groups: {get_attr: [TripleoUIPuppetBase, role_data, logging_groups]}
service_config_settings: {get_attr: [TripleoUIPuppetBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

1
docker/services/zaqar.yaml
View File

@ -78,7 +78,6 @@ outputs:
service_name: {get_attr: [ZaqarBase, role_data, service_name]}
config_settings: {get_attr: [ZaqarBase, role_data, config_settings]}
logging_source: {get_attr: [ZaqarBase, role_data, logging_source]}
logging_groups: {get_attr: [ZaqarBase, role_data, logging_groups]}
service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

Some files were not shown because too many files have changed in this diff Show More