summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml4
-rw-r--r--docker/services/aodh-api.yaml2
-rw-r--r--docker/services/aodh-evaluator.yaml2
-rw-r--r--docker/services/aodh-listener.yaml2
-rw-r--r--docker/services/aodh-notifier.yaml2
-rw-r--r--docker/services/barbican-api.yaml4
-rw-r--r--docker/services/ceilometer-agent-central.yaml3
-rw-r--r--docker/services/ceilometer-agent-compute.yaml2
-rw-r--r--docker/services/ceilometer-agent-ipmi.yaml2
-rw-r--r--docker/services/ceilometer-agent-notification.yaml2
-rw-r--r--docker/services/cinder-api.yaml2
-rw-r--r--docker/services/cinder-backup.yaml2
-rw-r--r--docker/services/cinder-scheduler.yaml3
-rw-r--r--docker/services/cinder-volume.yaml2
-rw-r--r--docker/services/collectd.yaml2
-rw-r--r--docker/services/congress.yaml2
-rw-r--r--docker/services/database/mongodb.yaml2
-rw-r--r--docker/services/database/mysql.yaml2
-rw-r--r--docker/services/database/redis.yaml2
-rw-r--r--docker/services/ec2-api.yaml2
-rw-r--r--docker/services/etcd.yaml2
-rw-r--r--docker/services/fluentd-client.yaml121
-rw-r--r--docker/services/glance-api.yaml2
-rw-r--r--docker/services/gnocchi-api.yaml2
-rw-r--r--docker/services/gnocchi-metricd.yaml2
-rw-r--r--docker/services/gnocchi-statsd.yaml2
-rw-r--r--docker/services/haproxy.yaml2
-rw-r--r--docker/services/heat-api-cfn.yaml2
-rw-r--r--docker/services/heat-api.yaml2
-rw-r--r--docker/services/heat-engine.yaml3
-rw-r--r--docker/services/horizon.yaml2
-rw-r--r--docker/services/ironic-api.yaml2
-rw-r--r--docker/services/ironic-conductor.yaml2
-rw-r--r--docker/services/iscsid.yaml2
-rw-r--r--docker/services/keystone.yaml2
-rw-r--r--docker/services/manila-api.yaml2
-rw-r--r--docker/services/manila-scheduler.yaml2
-rw-r--r--docker/services/manila-share.yaml2
-rw-r--r--docker/services/memcached.yaml2
-rw-r--r--docker/services/mistral-api.yaml2
-rw-r--r--docker/services/mistral-engine.yaml2
-rw-r--r--docker/services/mistral-executor.yaml2
-rw-r--r--docker/services/neutron-api.yaml2
-rw-r--r--docker/services/neutron-dhcp.yaml2
-rw-r--r--docker/services/neutron-l3.yaml2
-rw-r--r--docker/services/neutron-metadata.yaml2
-rw-r--r--docker/services/neutron-ovs-agent.yaml2
-rw-r--r--docker/services/neutron-plugin-ml2.yaml2
-rw-r--r--docker/services/nova-api.yaml2
-rw-r--r--docker/services/nova-compute.yaml2
-rw-r--r--docker/services/nova-conductor.yaml2
-rw-r--r--docker/services/nova-consoleauth.yaml2
-rw-r--r--docker/services/nova-ironic.yaml2
-rw-r--r--docker/services/nova-libvirt.yaml2
-rw-r--r--docker/services/nova-metadata.yaml2
-rw-r--r--docker/services/nova-migration-target.yaml2
-rw-r--r--docker/services/nova-placement.yaml2
-rw-r--r--docker/services/nova-scheduler.yaml2
-rw-r--r--docker/services/nova-vnc-proxy.yaml2
-rw-r--r--docker/services/octavia-api.yaml2
-rw-r--r--docker/services/octavia-health-manager.yaml3
-rw-r--r--docker/services/octavia-housekeeping.yaml3
-rw-r--r--docker/services/octavia-worker.yaml3
-rw-r--r--docker/services/opendaylight-api.yaml2
-rw-r--r--docker/services/ovn-controller.yaml2
-rw-r--r--docker/services/ovn-dbs.yaml2
-rw-r--r--docker/services/pacemaker/cinder-backup.yaml2
-rw-r--r--docker/services/pacemaker/cinder-volume.yaml2
-rw-r--r--docker/services/pacemaker/clustercheck.yaml2
-rw-r--r--docker/services/pacemaker/database/mysql.yaml2
-rw-r--r--docker/services/pacemaker/database/redis.yaml2
-rw-r--r--docker/services/pacemaker/haproxy.yaml2
-rw-r--r--docker/services/pacemaker/manila-share.yaml2
-rw-r--r--docker/services/pacemaker/ovn-dbs.yaml2
-rw-r--r--docker/services/pacemaker/rabbitmq.yaml2
-rw-r--r--docker/services/panko-api.yaml2
-rw-r--r--docker/services/rabbitmq.yaml2
-rw-r--r--docker/services/sahara-api.yaml2
-rw-r--r--docker/services/sahara-engine.yaml2
-rw-r--r--docker/services/sensu-client.yaml6
-rw-r--r--docker/services/swift-proxy.yaml2
-rw-r--r--docker/services/swift-ringbuilder.yaml2
-rw-r--r--docker/services/swift-storage.yaml2
-rw-r--r--docker/services/tacker.yaml2
-rw-r--r--docker/services/zaqar.yaml2
-rw-r--r--environments/services-docker/fluentd-client.yaml2
-rw-r--r--puppet/services/tripleo-packages.yaml9
-rwxr-xr-xtools/yaml-validate.py2
88 files changed, 306 insertions, 10 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 0429a4b4..cbbc5216 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -13,7 +13,9 @@ resource_registry:
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
- # TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/
+ # FIXME(mandre) fluentd container image missing from tripleomaster registry
+ # https://bugs.launchpad.net/tripleo/+bug/1721723
+ # OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml
OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
# Some infra instances don't pass the ping test but are otherwise working.
diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml
index 49c5f9c5..18068c85 100644
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@ -70,6 +70,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index 86bdfdf9..077ad46e 100644
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 3f986ab2..4471884b 100644
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index 852120c9..ffed5afa 100644
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml
index b1bf7da8..1aa000b6 100644
--- a/docker/services/barbican-api.yaml
+++ b/docker/services/barbican-api.yaml
@@ -71,6 +71,8 @@ outputs:
map_merge:
- get_attr: [BarbicanApiBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [BarbicanApiBase, role_data, logging_source]}
+ logging_groups: {get_attr: [BarbicanApiBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
@@ -151,4 +153,4 @@ outputs:
tags: step2
service: name=openstack-barbican-api state=stopped enabled=no
metadata_settings:
- get_attr: [BarbicanApiBase, role_data, metadata_settings] \ No newline at end of file
+ get_attr: [BarbicanApiBase, role_data, metadata_settings]
diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml
index d772462d..7033e0b0 100644
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@@ -36,7 +36,6 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -58,6 +57,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [CeilometerAgentCentralBase, role_data, step_config]
service_config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]}
diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml
index 90b30d46..ccde928c 100644
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@@ -58,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [CeilometerAgentComputeBase, role_data, step_config]
service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml
index 82d55be2..a139f29f 100644
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@@ -58,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
service_config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]}
diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index 891750ad..6c495131 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -58,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
service_config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]}
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 06705309..93890d02 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -68,6 +68,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml
index ad3b43c2..53febdb5 100644
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@@ -62,6 +62,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml
index 1ac31874..fa9d2418 100644
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@@ -37,7 +37,6 @@ parameters:
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -62,6 +61,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml
index eb904c0b..88e7712f 100644
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@@ -73,6 +73,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 3c0ba09b..ef7ddc52 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -63,6 +63,8 @@ outputs:
- get_attr: [CollectdBase, role_data, config_settings]
- 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]}
step_config: &step_config
get_attr: [CollectdBase, role_data, step_config]
service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml
index 08170cef..ba899b81 100644
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 5cf6f925..b933be96 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -70,6 +70,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 2425c74c..174acd44 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -79,6 +79,8 @@ outputs:
pid-file: /var/lib/mysql/mariadb.pid
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 487b4c67..627a40e8 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -68,6 +68,8 @@ outputs:
- redis::daemonize: false
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]}
step_config: &step_config
get_attr: [RedisBase, role_data, step_config]
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml
index 1d4ddd38..48f1da4b 100644
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@@ -60,6 +60,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 42c9f2d3..019b8c1b 100644
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -57,6 +57,8 @@ outputs:
description: Role data for the etcd role.
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/fluentd-client.yaml b/docker/services/fluentd-client.yaml
new file mode 100644
index 00000000..55ea2463
--- /dev/null
+++ b/docker/services/fluentd-client.yaml
@@ -0,0 +1,121 @@
+heat_template_version: pike
+
+description: >
+ OpenStack containerized fluentd services
+
+parameters:
+ DockerFluentdClientImage:
+ description: image
+ type: string
+ DockerFluentdConfigImage:
+ description: The container image to use fluentd config_volume
+ type: string
+ EndpointMap:
+ default: {}
+ description: Mapping of service endpoint -> protocol. Typically set
+ via parameter_defaults in the resource registry.
+ type: json
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
+ DefaultPasswords:
+ default: {}
+ type: json
+ RoleName:
+ default: ''
+ description: Role name on which the service is applied
+ type: string
+ RoleParameters:
+ default: {}
+ description: Parameters specific to the role
+ type: json
+
+resources:
+
+ ContainersCommon:
+ type: ./containers-common.yaml
+
+ FluentdClientBase:
+ type: ../../puppet/services/logging/fluentd-client.yaml
+ properties:
+ EndpointMap: {get_param: EndpointMap}
+ ServiceData: {get_param: ServiceData}
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ RoleName: {get_param: RoleName}
+ RoleParameters: {get_param: RoleParameters}
+
+outputs:
+ role_data:
+ description: Role data for the fluentd role.
+ value:
+ service_name: {get_attr: [FluentdClientBase, role_data, service_name]}
+ config_settings:
+ map_merge:
+ - {get_attr: [FluentdClientBase, role_data, config_settings]}
+ - tripleo::profile::base::logging::fluentd::fluentd_path_transform:
+ - /var/log/
+ - /var/log/containers/
+ step_config: &step_config
+ get_attr: [FluentdClientBase, role_data, step_config]
+ # BEGIN DOCKER SETTINGS
+ puppet_config:
+ config_volume: fluentd
+ puppet_tags: config
+ step_config: *step_config
+ config_image: {get_param: DockerFluentdConfigImage}
+ kolla_config:
+ /var/lib/kolla/config_files/fluentd.json:
+ command: /usr/bin/fluentd -c /etc/fluentd/fluent.conf -o /var/log/fluentd/fluentd.log
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
+ permissions:
+ - path: /var/lib/fluentd
+ owner: fluentd:fluentd
+ recurse: true
+ - path: /var/log/fluentd
+ owner: fluentd:fluentd
+ recurse: true
+ docker_config:
+ step_3:
+ fluentd_client:
+ image: {get_param: DockerFluentdClientImage}
+ net: host
+ privileged: true
+ user: root
+ restart: always
+ volumes:
+ list_concat:
+ - {get_attr: [ContainersCommon, volumes]}
+ -
+ - /var/cache/containers/fluentd:/var/cache/fluentd:rw
+ - /var/lib/kolla/config_files/fluentd.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/puppet-generated/fluentd/:/var/lib/kolla/config_files/src:ro
+ - /var/log/containers:/var/log/containers:ro
+ - /var/log/containers/fluentd:/var/log/fluentd:rw
+ environment:
+ - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+ host_prep_tasks:
+ - name: create persistent logs directory for fluentd
+ file:
+ path: /var/log/containers/fluentd
+ state: directory
+ - name: create persistent cache directory
+ file:
+ path: /var/cache/containers/fluentd
+ state: directory
+ upgrade_tasks:
+ - name: Stop and disable fluentd service
+ tags: step2
+ service: name=fluentd.service state=stopped enabled=no
+
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 8f2bd604..f23ec357 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -78,6 +78,8 @@ outputs:
map_merge:
- get_attr: [GlanceApiPuppetBase, role_data, 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 47b3b811..96f6ab98 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -71,6 +71,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
get_attr: [GnocchiApiPuppetBase, role_data, step_config]
service_config_settings: {get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]}
diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml
index 9a114458..b966fa68 100644
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@@ -61,6 +61,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index 834d0055..0ebc83f6 100644
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -61,6 +61,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index 70e1f893..b6c43527 100644
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -100,6 +100,8 @@ outputs:
# NOTE(jaosorior): We disable the CRL since we have no way to restart haproxy
# 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]}
step_config: &step_config
get_attr: [HAProxyBase, role_data, step_config]
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml
index cfe11cd6..84bc0672 100644
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@@ -69,6 +69,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
get_attr: [HeatBase, role_data, step_config]
service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml
index 2bb588de..75d0b8c1 100644
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@@ -71,6 +71,8 @@ outputs:
- apache::default_vhost: false
step_config: &step_config
get_attr: [HeatBase, role_data, step_config]
+ logging_source: {get_attr: [HeatBase, role_data, logging_source]}
+ logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml
index fdba7d58..21ae2426 100644
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@@ -37,7 +37,6 @@ parameters:
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -65,6 +64,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 9a2c8bad..d6ffb6dc 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -73,6 +73,8 @@ outputs:
access_log_format: '%a %l %u %t \"%r\" %>s %b \"%%{}{Referer}i\" \"%%{}{User-Agent}i\"'
options: ['FollowSymLinks','MultiViews']
- horizon::secure_cookies: false
+ logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
+ logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}
step_config: {get_attr: [HorizonBase, role_data, step_config]}
service_config_settings: {get_attr: [HorizonBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 38710f3b..156e5f98 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -64,6 +64,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 37f4d46e..465aa8b1 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -71,6 +71,8 @@ outputs:
- ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index c34a59d5..da9b1b2c 100644
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -57,6 +57,8 @@ outputs:
value:
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]}
step_config: &step_config
{get_attr: [IscsidBase, role_data, step_config]}
service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 8f4a2014..26cef614 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -81,6 +81,8 @@ outputs:
map_merge:
- get_attr: [KeystoneBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
+ logging_groups: {get_attr: [KeystoneBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml
index a0e501ec..d2360f97 100644
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@@ -59,6 +59,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml
index 7b5dfec3..931ce23d 100644
--- a/docker/services/manila-scheduler.yaml
+++ b/docker/services/manila-scheduler.yaml
@@ -59,6 +59,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 332ba864..cf3303c3 100644
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@@ -61,6 +61,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index 7e28bdc1..c78b85a6 100644
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -58,6 +58,8 @@ outputs:
value:
service_name: {get_attr: [MemcachedBase, role_data, service_name]}
config_settings: {get_attr: [MemcachedBase, role_data, config_settings]}
+ logging_source: {get_attr: [MemcachedBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MemcachedBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [MemcachedBase, role_data, step_config]
service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
index 38b97aef..50c80216 100644
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
index 2b498be3..12f7779b 100644
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@@ -64,6 +64,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index e106fe47..0ee7d534 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -64,6 +64,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index c028fc28..11ab93be 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -67,6 +67,8 @@ outputs:
description: Role data for the Neutron API role.
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]
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 4b75d542..4b5a2711 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -60,6 +60,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
get_attr: [NeutronBase, role_data, step_config]
service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 06470c05..09232c26 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -58,6 +58,8 @@ outputs:
value:
service_name: {get_attr: [NeutronL3Base, role_data, service_name]}
config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
+ logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
+ logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
step_config: &step_config
get_attr: [NeutronL3Base, role_data, step_config]
puppet_config:
diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml
index a5a7c34b..9fe839e9 100644
--- a/docker/services/neutron-metadata.yaml
+++ b/docker/services/neutron-metadata.yaml
@@ -58,6 +58,8 @@ outputs:
value:
service_name: {get_attr: [NeutronMetadataBase, role_data, service_name]}
config_settings: {get_attr: [NeutronMetadataBase, role_data, config_settings]}
+ logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [NeutronMetadataBase, role_data, step_config]
puppet_config:
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml
index 81bb1c20..246008c5 100644
--- a/docker/services/neutron-ovs-agent.yaml
+++ b/docker/services/neutron-ovs-agent.yaml
@@ -58,6 +58,8 @@ outputs:
value:
service_name: {get_attr: [NeutronOvsAgentBase, role_data, service_name]}
config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]}
+ logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [NeutronOvsAgentBase, role_data, step_config]
puppet_config:
diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 8d12e0de..88d46ca2 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -53,6 +53,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
get_attr: [NeutronBase, role_data, step_config]
service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 9f1ae865..ed4a6175 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -71,6 +71,8 @@ outputs:
map_merge:
- get_attr: [NovaApiBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [NovaApiBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaApiBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 34f56cdf..c4846713 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -71,6 +71,8 @@ outputs:
service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
config_settings:
get_attr: [NovaComputeBase, role_data, config_settings]
+ logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml
index 17d137cc..56275b02 100644
--- a/docker/services/nova-conductor.yaml
+++ b/docker/services/nova-conductor.yaml
@@ -65,6 +65,8 @@ outputs:
value:
service_name: {get_attr: [NovaConductorBase, role_data, service_name]}
config_settings: {get_attr: [NovaConductorBase, role_data, config_settings]}
+ logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml
index 715a861b..85078f14 100644
--- a/docker/services/nova-consoleauth.yaml
+++ b/docker/services/nova-consoleauth.yaml
@@ -61,6 +61,8 @@ outputs:
value:
service_name: {get_attr: [NovaConsoleauthPuppetBase, role_data, service_name]}
config_settings: {get_attr: [NovaConsoleauthPuppetBase, role_data, config_settings]}
+ logging_source: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 543758a1..1bed40ec 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -61,6 +61,8 @@ outputs:
value:
service_name: {get_attr: [NovaIronicBase, role_data, service_name]}
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index c059cfaf..df168945 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -116,6 +116,8 @@ outputs:
- get_attr: [NovaLibvirtBase, role_data, config_settings]
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index 53ae7910..54d9312b 100644
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@@ -60,6 +60,8 @@ outputs:
config_settings:
map_merge:
- get_attr: [NovaMetadataBase, role_data, config_settings]
+ logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaMetadataBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [NovaMetadataBase, role_data, step_config]
service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index 904a042f..cb3b950e 100644
--- a/docker/services/nova-migration-target.yaml
+++ b/docker/services/nova-migration-target.yaml
@@ -106,6 +106,8 @@ outputs:
tripleo::profile::base::nova::migration::proxy::target_port: {get_param: DockerNovaMigrationSshdPort}
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index d66a6fb8..8015071b 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -71,6 +71,8 @@ outputs:
map_merge:
- get_attr: [NovaPlacementBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaPlacementBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml
index 8d8a6358..e75df942 100644
--- a/docker/services/nova-scheduler.yaml
+++ b/docker/services/nova-scheduler.yaml
@@ -61,6 +61,8 @@ outputs:
value:
service_name: {get_attr: [NovaSchedulerBase, role_data, service_name]}
config_settings: {get_attr: [NovaSchedulerBase, role_data, config_settings]}
+ logging_source: {get_attr: [NovaSchedulerBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaSchedulerBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml
index c5f651d2..f1bb0eba 100644
--- a/docker/services/nova-vnc-proxy.yaml
+++ b/docker/services/nova-vnc-proxy.yaml
@@ -61,6 +61,8 @@ outputs:
value:
service_name: {get_attr: [NovaVncProxyPuppetBase, role_data, service_name]}
config_settings: {get_attr: [NovaVncProxyPuppetBase, role_data, config_settings]}
+ logging_source: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index da698991..c5e729c4 100644
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@@ -69,6 +69,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index f5e1eda5..38c4faf0 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -37,7 +37,6 @@ parameters:
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
service_config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]}
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index 1dc0db37..64e4f480 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -37,7 +37,6 @@ parameters:
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
service_config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]}
diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index d29e1a3a..e00f6bb8 100644
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -37,7 +37,6 @@ parameters:
description: Parameters specific to the role
type: json
-
resources:
ContainersCommon:
@@ -59,6 +58,8 @@ outputs:
value:
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]}
step_config: &step_config
get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
service_config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]}
diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index 2a6fcfe8..dbe49e9b 100644
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@@ -60,6 +60,8 @@ outputs:
config_settings:
map_merge:
- get_attr: [OpenDaylightBase, role_data, config_settings]
+ logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
+ logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [OpenDaylightBase, role_data, step_config]
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml
index c5c365e2..285d14bb 100644
--- a/docker/services/ovn-controller.yaml
+++ b/docker/services/ovn-controller.yaml
@@ -60,6 +60,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
get_attr: [OvnControllerBase, role_data, step_config]
service_config_settings: {get_attr: [OvnControllerBase, role_data, service_config_settings]}
diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml
index f6ac62ed..977f95fb 100644
--- a/docker/services/ovn-dbs.yaml
+++ b/docker/services/ovn-dbs.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
get_attr: [OVNDbsBase, role_data, step_config]
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index cdb8c1bc..46b9932a 100644
--- a/docker/services/pacemaker/cinder-backup.yaml
+++ b/docker/services/pacemaker/cinder-backup.yaml
@@ -85,6 +85,8 @@ outputs:
- 'pcmklatest'
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]}
step_config: ""
service_config_settings: {get_attr: [CinderBackupBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml
index 15c5e099..2f68b126 100644
--- a/docker/services/pacemaker/cinder-volume.yaml
+++ b/docker/services/pacemaker/cinder-volume.yaml
@@ -79,6 +79,8 @@ outputs:
cinder::volume::manage_service: false
cinder::volume::enabled: false
cinder::host: hostgroup
+ logging_source: {get_attr: [CinderBase, role_data, logging_source]}
+ logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
step_config: ""
service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml
index c7c316a4..69f306b1 100644
--- a/docker/services/pacemaker/clustercheck.yaml
+++ b/docker/services/pacemaker/clustercheck.yaml
@@ -60,6 +60,8 @@ outputs:
value:
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]}
step_config: "include ::tripleo::profile::pacemaker::clustercheck"
# BEGIN DOCKER SETTINGS #
puppet_config:
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 9dace271..936272fa 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -104,6 +104,8 @@ outputs:
tripleo::profile::pacemaker::database::mysql_bundle::ca_file:
get_param: InternalTLSCAFile
- {}
+ logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
step_config: ""
# BEGIN DOCKER SETTINGS #
puppet_config:
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 4d26a084..bcda4efc 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/database/redis.yaml
@@ -86,6 +86,8 @@ outputs:
- 26379
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]}
step_config: ""
service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 2cc04e96..ba0f0efc 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -99,6 +99,8 @@ outputs:
data: {get_param: DockerHAProxyImage}
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]}
step_config: ""
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index 805f101c..a31c1c74 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/docker/services/pacemaker/manila-share.yaml
@@ -69,6 +69,8 @@ outputs:
manila::share::manage_service: false
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]}
step_config: ""
service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index 03c5a397..1658b093 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/docker/services/pacemaker/ovn-dbs.yaml
@@ -73,6 +73,8 @@ outputs:
- tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image: {get_param: DockerOvnDbsImage}
- 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]}
step_config: ''
service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index 7333689c..5660856a 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@ -77,6 +77,8 @@ outputs:
- 4369
- 5672
- 25672
+ logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
+ logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
step_config: &step_config
get_attr: [RabbitmqBase, role_data, step_config]
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml
index 3edd9049..7987c8dc 100644
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@ -73,6 +73,8 @@ outputs:
map_merge:
- get_attr: [PankoApiPuppetBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
+ logging_groups: {get_attr: [PankoApiPuppetBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index add78879..632bdc29 100644
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -82,6 +82,8 @@ outputs:
- internal_tls_enabled
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml
index b0c3736c..ab8cef12 100644
--- a/docker/services/sahara-api.yaml
+++ b/docker/services/sahara-api.yaml
@@ -62,6 +62,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml
index b1660296..08841160 100644
--- a/docker/services/sahara-engine.yaml
+++ b/docker/services/sahara-engine.yaml
@@ -62,6 +62,8 @@ outputs:
map_merge:
- 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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml
index b64231cd..a535af46 100644
--- a/docker/services/sensu-client.yaml
+++ b/docker/services/sensu-client.yaml
@@ -39,13 +39,17 @@ parameters:
SensuDockerCheckCommand:
type: string
default: |
+ output=''
for i in $(docker ps --format '{{.ID}}'); do
if result=$(docker inspect --format='{{.State.Health.Status}}' $i 2>/dev/null); then
if [ "$result" != 'healthy' ]; then
- echo "$(docker inspect --format='{{.Name}}' $i) ($i): $(docker inspect --format='{{json .State}}' $i)" && exit 2;
+ output="${output} ; $(docker inspect --format='{{.Name}}' $i) ($i): $(docker inspect --format='{{(index .State.Health.Log 0).Output}}' $i)";
fi
fi
done
+ if [ ! -z "${output}" ]; then
+ echo ${output:3} && exit 2;
+ fi
SensuDockerCheckInterval:
type: number
description: The frequency in seconds the docker health check is executed.
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 86871210..2d745f7b 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -67,6 +67,8 @@ outputs:
config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
step_config: &step_config
get_attr: [SwiftProxyBase, role_data, step_config]
+ 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:
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 2a44f703..bfb57edd 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -91,6 +91,8 @@ outputs:
map_merge:
- {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]}
step_config: &step_config
get_attr: [SwiftRingbuilderBase, role_data, step_config]
service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index e879b25d..108a0368 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -77,6 +77,8 @@ outputs:
- {get_attr: [SwiftStorageBase, role_data, config_settings]}
# 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]}
step_config: &step_config
get_attr: [SwiftStorageBase, role_data, step_config]
service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml
index 1b7d78ca..9bd5de26 100644
--- a/docker/services/tacker.yaml
+++ b/docker/services/tacker.yaml
@@ -63,6 +63,8 @@ outputs:
config_settings:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index ab30ab5a..ff40cb1a 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -73,6 +73,8 @@ outputs:
value:
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]}
step_config: &step_config
list_join:
- "\n"
diff --git a/environments/services-docker/fluentd-client.yaml b/environments/services-docker/fluentd-client.yaml
new file mode 100644
index 00000000..1781a59c
--- /dev/null
+++ b/environments/services-docker/fluentd-client.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+ OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml
diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index 2a8620c8..0dbdbf89 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -53,6 +53,15 @@ outputs:
fail: msg="rpm-python package was not present before this run! Check environment before re-running"
when: rpm_python_check.changed != false
tags: step0
+ - block:
+ - name: Upgrade os-net-config
+ yum: name=os-net-config state=latest
+ - name: take new os-net-config parameters into account now
+ command: os-net-config --no-activate -c /etc/os-net-config/config.json -v --detailed-exit-codes
+ register: os_net_config_upgrade
+ failed_when: os_net_config_upgrade.rc not in [0,2]
+ changed_when: os_net_config_upgrade.rc == 2
+ tags: step3
- name: Update all packages
tags: step3
yum: name=* state=latest
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 66ac1010..de8ba806 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -37,7 +37,7 @@ REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config',
OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
'post_upgrade_tasks', 'service_config_settings',
'host_prep_tasks', 'metadata_settings',
- 'kolla_config']
+ 'kolla_config', 'logging_source', 'logging_groups']
REQUIRED_DOCKER_PUPPET_CONFIG_SECTIONS = ['config_volume', 'step_config',
'config_image']
OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags', 'volumes' ]