openstack/openstack-ansible
Code Issues Proposed changes

Convert rsyslog to an include_task

Browse Source 
The rsyslog role has served us well however there's now a better way
given the ability to remotely journal. This change disables the use of
the `rsyslog_client` and `server` roles unless journal remote is
unavailable. In this change the `rsyslog_client` interaction has been
moved into an include_tasks which is conditionally loaded when the
variable `rsyslog_client_enabled` is set to true. Additionally the
`rsyslog_server` role is disabled unless `rsyslog_server_enabled`
is set true. Using the new variables legacy functionality can be
enabled. By disabling the general rsyslog roles we'll lessen the
overall IO on the cloud and improve the speed of the deployment.

> NOTE: At this time there's no suitable package to install
        "systemd-journal-remote" on opensuse so a conditional has been
        added to ensure distributed log syncing remains functional on
        all of our supported distros. Should a package be made
        available for journal remote we can globally disable the
        legacy rsyslog roles entirely by default.

Change-Id: Ice21667c6999d0ac86b2d7bde648a0375f890210
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2018-03-25 00:25:02 -05:00 committed by Jean-Philippe Evrard
parent cac7f2c183
commit 03956a9274
34 changed files with 309 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inventory/group_vars/all/all.yml
View File

@ -48,6 +48,11 @@ systemd_utils_prefix: "{{ systemd_utils_distro_prefix[ansible_pkg_mgr] }}"
# Ensure that the package state matches the global setting
rsyslog_client_package_state: "{{ package_state }}"
# At this time there's no suitable package available for systemd-journal-remote/gateway
# When installing on SUSE 42.x. For now this playbook will omit suse when the package
# manager is "zypper". When a suitable package is available on SUSE this should be removed.
rsyslog_client_enabled: "{{ ansible_pkg_mgr == 'zypper' }}"
rsyslog_server_enabled: "{{ ansible_pkg_mgr == 'zypper' }}"
## OpenStack source options
openstack_repo_url: "http://{{ internal_lb_vip_address }}:{{ repo_server_port }}"

30
playbooks/ceph-install.yml
View File

@ -87,6 +87,7 @@
state: present
when:
- ansible_pkg_mgr in ['yum', 'dnf']
roles:
- role: ceph-defaults
tags:
@ -103,15 +104,17 @@
- role: ceph-mgr
tags:
- skip_ansible_lint
- role: rsyslog_client
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
tags:
- rsyslog
- role: system_crontab_coordination
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
vars:
ansible_python_interpreter: "/usr/bin/python"
environment: "{{ deployment_environment_variables | default({}) }}"
@ -175,6 +178,7 @@
tags:
- ceph-osd
- ceph-mon-facts
roles:
- role: ceph-defaults
tags:
@ -188,15 +192,17 @@
- role: ceph-osd
tags:
- skip_ansible_lint
- role: rsyslog_client
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
tags:
- rsyslog
- role: system_crontab_coordination
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- ceph

15
playbooks/ceph-rgw-install.yml
View File

@ -166,16 +166,17 @@
- role: ceph-rgw
tags:
- skip_ansible_lint
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
tags:
- "ceph-rsyslog-client"
- "rsyslog-client"
- role: "system_crontab_coordination"
tags:
- "system-crontab-coordination"
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ceph_log_rotate
rsyslog_client_log_dir: "/var/log/ceph"
rsyslog_client_config_name: "99-ceph-rsyslog-client.conf"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
radosgw_keystone: yes

13
playbooks/common-playbooks/cinder.yml
View File

@ -100,18 +100,17 @@
- role: "os_cinder"
cinder_storage_address: "{{ storage_address }}"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: cinder_log_rotate
rsyslog_client_log_dir: "/var/log/cinder"
rsyslog_client_config_name: "99-cinder-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "../common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: cinder_log_rotate
rsyslog_client_log_dir: "/var/log/cinder"
rsyslog_client_config_name: "99-cinder-rsyslog-client.conf"
# Now that container changes are done, we can set
# the load balancer back end for this container
# to available again.

14
playbooks/common-playbooks/glance.yml
View File

@ -62,19 +62,17 @@
roles:
- role: "os_glance"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: glance_log_rotate
rsyslog_client_log_dir: "/var/log/glance"
rsyslog_client_config_name: "99-glance-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "../common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: glance_log_rotate
rsyslog_client_log_dir: "/var/log/glance"
rsyslog_client_config_name: "99-glance-rsyslog-client.conf"
# Now that container changes are done, we can set
# the load balancer back end for this container
# to available again.

36
playbooks/common-playbooks/neutron.yml
View File

@ -95,24 +95,24 @@
tags:
- bird
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: neutron_log_rotate
rsyslog_client_log_dir: "/var/log/neutron"
rsyslog_client_config_name: "99-neutron-rsyslog-client.conf"
rsyslog_client_log_files:
- /var/log/conntrackd.log
- /var/log/conntrackd-stats.log
tags:
- rsyslog
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: calico_log_rotate
rsyslog_client_log_dir: "/var/log/calico"
rsyslog_client_config_name: "99-calico-rsyslog-client.conf"
when: "'neutron_calico_dhcp_agent' in group_names"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "../common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: neutron_log_rotate
rsyslog_client_log_dir: "/var/log/neutron"
rsyslog_client_log_files:
- /var/log/conntrackd.log
- /var/log/conntrackd-stats.log
rsyslog_client_config_name: "99-neutron-rsyslog-client.conf"
- include_tasks: "../common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: calico_log_rotate
rsyslog_client_log_dir: "/var/log/calico"
rsyslog_client_config_name: "99-calico-rsyslog-client.conf"
when:
- "'neutron_calico_dhcp_agent' in group_names"

13
playbooks/common-playbooks/nova.yml
View File

@ -144,18 +144,17 @@
nova_management_address: "{{ management_address }}"
nova_cinder_rbd_inuse: "{{ hostvars['localhost']['nova_cinder_rbd_inuse'] }}"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: nova_log_rotate
rsyslog_client_log_dir: "/var/log/nova"
rsyslog_client_config_name: "99-nova-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "../common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: nova_log_rotate
rsyslog_client_log_dir: "/var/log/nova"
rsyslog_client_config_name: "99-nova-rsyslog-client.conf"
# Now that container changes are done, we can set
# the load balancer back end for this container
# to available again.

23
playbooks/common-tasks/rsyslog-client.yml Normal file
View File

@ -0,0 +1,23 @@
---
# Copyright 2018, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Run the rsyslog client role
include_role:
name: rsyslog_client
private: true
when:
- rsyslog_client_enabled | bool
tags:
- rsyslog

14
playbooks/containers-lxc-host.yml
View File

@ -43,12 +43,14 @@
state: "link"
roles:
- role: "lxc_hosts"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: lxc_log_rotate
rsyslog_client_log_dir: "/var/log/lxc"
rsyslog_client_config_name: "99-lxc-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: lxc_log_rotate
rsyslog_client_log_dir: "/var/log/lxc"
rsyslog_client_config_name: "99-lxc-rsyslog-client.conf"
vars_files:
- defaults/repo_packages/openstack_services.yml
environment: "{{ deployment_environment_variables | default({}) }}"

20
playbooks/galera-install.yml
View File

@ -52,18 +52,20 @@
haproxy_state: enabled
static: no
when: "groups['haproxy'] | default([]) | length > 0"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: galera_log_rotate
rsyslog_client_log_dir: "/var/log/mysql_logs"
rsyslog_client_log_files:
- /var/log/mysql.log
- /var/log/mysql.err
rsyslog_client_config_name: "99-galera-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: galera_log_rotate
rsyslog_client_log_dir: "/var/log/mysql_logs"
rsyslog_client_log_files:
- /var/log/mysql.log
- /var/log/mysql.err
rsyslog_client_config_name: "99-galera-rsyslog-client.conf"
vars:
galera_server_id: "{{ inventory_hostname | string_2_int }}"
galera_wsrep_node_name: "{{ container_name }}"

14
playbooks/haproxy-install.yml
View File

@ -55,12 +55,14 @@
- keepalived
- role: "haproxy_server"
haproxy_service_configs: "{{ haproxy_default_services + haproxy_extra_services|default([]) }}"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: haproxy_log_rotate
rsyslog_client_log_dir: "/var/log/haproxy"
rsyslog_client_config_name: "99-haproxy-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: haproxy_log_rotate
rsyslog_client_log_dir: "/var/log/haproxy"
rsyslog_client_config_name: "99-haproxy-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- haproxy-config

14
playbooks/memcached-install.yml
View File

@ -30,15 +30,17 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "memcached_server"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: memcached_log_rotate
rsyslog_client_log_dir: "/var/log/memcached"
rsyslog_client_config_name: "99-memcached-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: memcached_log_rotate
rsyslog_client_log_dir: "/var/log/memcached"
rsyslog_client_config_name: "99-memcached-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- memcached

14
playbooks/os-aodh-install.yml
View File

@ -68,12 +68,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_aodh"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: aodh_log_rotate
rsyslog_client_log_dir: "/var/log/aodh"
rsyslog_client_config_name: "99-aodh-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: aodh_log_rotate
rsyslog_client_log_dir: "/var/log/aodh"
rsyslog_client_config_name: "99-aodh-rsyslog-client.conf"
vars:
aodh_rabbitmq_userid: aodh
aodh_rabbitmq_vhost: /aodh

14
playbooks/os-barbican-install.yml
View File

@ -68,12 +68,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_barbican"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: barbican_log_rotate
rsyslog_client_log_dir: "/var/log/barbican"
rsyslog_client_config_name: "99-barbican-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: barbican_log_rotate
rsyslog_client_log_dir: "/var/log/barbican"
rsyslog_client_config_name: "99-barbican-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- barbican

14
playbooks/os-ceilometer-install.yml
View File

@ -60,12 +60,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_ceilometer"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ceilometer_log_rotate
rsyslog_client_log_dir: "/var/log/ceilometer"
rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ceilometer_log_rotate
rsyslog_client_log_dir: "/var/log/ceilometer"
rsyslog_client_config_name: "99-ceilometer-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- ceilometer

13
playbooks/os-congress-install.yml
View File

@ -44,12 +44,13 @@
include: common-tasks/package-cache-proxy.yml
roles:
- role: "os_congress"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: congress_log_rotate
rsyslog_client_log_dir: "/var/log/congress"
rsyslog_client_config_name: "99-congress-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: congress_log_rotate
rsyslog_client_log_dir: "/var/log/congress"
rsyslog_client_config_name: "99-congress-rsyslog-client.conf"

14
playbooks/os-designate-install.yml
View File

@ -85,12 +85,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_designate"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: designate_log_rotate
rsyslog_client_log_dir: "/var/log/designate"
rsyslog_client_config_name: "99-designate-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: designate_log_rotate
rsyslog_client_log_dir: "/var/log/designate"
rsyslog_client_config_name: "99-designate-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- designate

14
playbooks/os-gnocchi-install.yml
View File

@ -54,12 +54,14 @@
tags:
- ceph
- role: "os_gnocchi"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: gnocchi_log_rotate
rsyslog_client_log_dir: "/var/log/gnocchi"
rsyslog_client_config_name: "99-gnocchi-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: gnocchi_log_rotate
rsyslog_client_log_dir: "/var/log/gnocchi"
rsyslog_client_config_name: "99-gnocchi-rsyslog-client.conf"
vars:
gnocchi_galera_user: gnocchi
gnocchi_galera_database: gnocchi

14
playbooks/os-heat-install.yml
View File

@ -82,15 +82,17 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_heat"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: heat_log_rotate
rsyslog_client_log_dir: "/var/log/heat"
rsyslog_client_config_name: "99-heat-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: heat_log_rotate
rsyslog_client_log_dir: "/var/log/heat"
rsyslog_client_config_name: "99-heat-rsyslog-client.conf"
vars_files:
- defaults/repo_packages/openstack_services.yml
vars:

14
playbooks/os-horizon-install.yml
View File

@ -38,15 +38,17 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_horizon"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: horizon_log_rotate
rsyslog_client_log_dir: "/var/log/horizon"
rsyslog_client_config_name: "99-horizon-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: horizon_log_rotate
rsyslog_client_log_dir: "/var/log/horizon"
rsyslog_client_config_name: "99-horizon-rsyslog-client.conf"
vars:
horizon_galera_user: horizon
horizon_galera_database: horizon

14
playbooks/os-ironic-install.yml
View File

@ -54,15 +54,17 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_ironic"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"
rsyslog_client_config_name: "99-ironic-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"
rsyslog_client_config_name: "99-ironic-rsyslog-client.conf"
vars:
ironic_galera_user: ironic
ironic_galera_database: ironic

12
playbooks/os-keystone-install.yml
View File

@ -153,17 +153,17 @@
roles:
- role: "os_keystone"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: keystone_log_rotate
rsyslog_client_log_dir: "/var/log/keystone"
rsyslog_client_config_name: "99-keystone-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: keystone_log_rotate
rsyslog_client_log_dir: "/var/log/keystone"
rsyslog_client_config_name: "99-keystone-rsyslog-client.conf"
# Now that container changes are done, we can set
# the load balancer back end for this container
# to available again.

14
playbooks/os-magnum-install.yml
View File

@ -61,12 +61,14 @@
when: inventory_hostname == groups['magnum_all'][0]
roles:
- role: "os_magnum"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: magnum_log_rotate
rsyslog_client_log_dir: "/var/log/magnum"
rsyslog_client_config_name: "99-magnum-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: magnum_log_rotate
rsyslog_client_log_dir: "/var/log/magnum"
rsyslog_client_config_name: "99-magnum-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- "magnum"

14
playbooks/os-molteniron-install.yml
View File

@ -37,15 +37,17 @@
- role: "os_molteniron"
molteniron_venv_tag: "{{ openstack_release }}"
molteniron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/molteniron-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"
rsyslog_client_config_name: "99-ironic-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"
rsyslog_client_config_name: "99-ironic-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- molteniron

14
playbooks/os-octavia-install.yml
View File

@ -60,15 +60,17 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_octavia"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: octavia_log_rotate
rsyslog_client_log_dir: "/var/log/octavia"
rsyslog_client_config_name: " 100-octavia-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: octavia_log_rotate
rsyslog_client_log_dir: "/var/log/octavia"
rsyslog_client_config_name: "100-octavia-rsyslog-client.conf"
vars:
octavia_galera_user: octavia
octavia_galera_database: octavia

14
playbooks/os-sahara-install.yml
View File

@ -80,12 +80,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_sahara"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: sahara_log_rotate
rsyslog_client_log_dir: "/var/log/sahara"
rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: sahara_log_rotate
rsyslog_client_log_dir: "/var/log/sahara"
rsyslog_client_config_name: "99-sahara-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- sahara

18
playbooks/os-swift-install.yml
View File

@ -74,17 +74,19 @@
hosts: swift_all
user: root
roles:
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: swift_log_rotate
rsyslog_client_log_dir: "/var/log/swift"
rsyslog_client_config_name: "99-swift-rsyslog-client.conf"
rsyslog_client_log_files:
- /var/log/rsyncd.log
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: swift_log_rotate
rsyslog_client_log_dir: "/var/log/swift"
rsyslog_client_config_name: "99-swift-rsyslog-client.conf"
rsyslog_client_log_files:
- /var/log/rsyncd.log
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- swift

14
playbooks/os-tacker-install.yml
View File

@ -55,12 +55,14 @@
when: inventory_hostname == groups['tacker_all'][0]
roles:
- role: "os_tacker"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: tacker_log_rotate
rsyslog_client_log_dir: "/var/log/tacker"
rsyslog_client_config_name: "99-tacker-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: tacker_log_rotate
rsyslog_client_log_dir: "/var/log/tacker"
rsyslog_client_config_name: "99-tacker-rsyslog-client.conf"
vars:
tacker_galera_address: "{{ internal_lb_vip_address }}"
environment: "{{ deployment_environment_variables | default({}) }}"

14
playbooks/os-tempest-install.yml
View File

@ -19,15 +19,17 @@
user: root
roles:
- role: "os_tempest"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: utility_log_rotate
rsyslog_client_log_dir: "{{ tempest_log_dir }}"
rsyslog_client_config_name: "99-tempest-rsyslog-client.conf"
tags:
- rsyslog
- role: "system_crontab_coordination"
tags:
- crontab
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: utility_log_rotate
rsyslog_client_log_dir: "{{ tempest_log_dir }}"
rsyslog_client_config_name: "99-tempest-rsyslog-client.conf"
vars_files:
- defaults/repo_packages/openstack_testing.yml
environment: "{{ deployment_environment_variables | default({}) }}"

14
playbooks/os-trove-install.yml
View File

@ -85,12 +85,14 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_trove"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: trove_log_rotate
rsyslog_client_log_dir: "/var/log/trove"
rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: trove_log_rotate
rsyslog_client_log_dir: "/var/log/trove"
rsyslog_client_config_name: "99-trove-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- trove

14
playbooks/rabbitmq-install.yml
View File

@ -52,12 +52,14 @@
user: root
roles:
- role: "rabbitmq_server"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: rabbitmq_log_rotate
rsyslog_client_log_dir: "/var/log/rabbitmq"
rsyslog_client_config_name: "99-rabbitmq-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: rabbitmq_log_rotate
rsyslog_client_log_dir: "/var/log/rabbitmq"
rsyslog_client_config_name: "99-rabbitmq-rsyslog-client.conf"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- rabbitmq

43
playbooks/repo-server.yml
View File

@ -42,28 +42,27 @@
roles:
- role: "repo_server"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: repo_nginx_log_rotate
rsyslog_client_log_dir: "/var/log/nginx"
rsyslog_client_log_files:
- /var/log/rsyncd.log
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
tags:
- rsyslog
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: lsyncd_log_rotate
rsyslog_client_log_dir: "/var/log/lsyncd"
rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
tags:
- rsyslog
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: pypiserver_log_rotate
rsyslog_client_log_dir: "/var/log/pypiserver"
rsyslog_client_config_name: "99-pypiserver-rsyslog-client.conf"
tags:
- rsyslog
post_tasks:
- include_tasks: "common-tasks/rsyslog-client.yml"
vars:
rsyslog_client_log_rotate_file: "{{ rsyslog_var.log_rotate_file }}"
rsyslog_client_log_dir: "{{ rsyslog_var.log_dir }}"
rsyslog_client_log_files: "{{ rsyslog_var.log_files | default([]) }}"
rsyslog_client_config_name: "{{ rsyslog_var.config_name }}"
with_items:
- log_rotate_file: pypiserver_log_rotate
log_dir: "/var/log/pypiserver"
config_name: "99-pypiserver-rsyslog-client.conf"
- log_rotate_file: lsyncd_log_rotate
log_dir: "/var/log/lsyncd"
config_name: "99-lsyncd-rsyslog-client.conf"
- log_rotate_file: repo_nginx_log_rotate
log_dir: "/var/log/nginx"
log_files:
- /var/log/rsyncd.log
config_name: "99-repo-nginx-rsyslog-client.conf"
loop_control:
loop_var: rsyslog_var
vars_files:
- defaults/repo_packages/openstack_services.yml

6
playbooks/rsyslog-install.yml
View File

@ -18,6 +18,12 @@
gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root
pre_tasks:
# The systemd-journal-remote capability has taken over this functionality.
- name: End playbook if disabled
meta: end_play
when:
- not rsyslog_server_enabled | bool
- include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
vars:
list_of_bind_mounts:

6
releasenotes/notes/rsyslog-disable-ffc4ebf27cc77330.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- With the implementation of `systemd-journal-remote` the
`rsyslog_client` role is no longer run by default. To enable the legacy
functionality, the variable `rsyslog_client_enabled` and
`rsyslog_server_enabled` can be set to **true**.