openstack
/
kolla
Code Issues Proposed changes

Add cron image and playbook 

Add cron image and playbook for logrotate.

The "common" Ansible playbook includes configuration files for
logrotate. At this point the operator cannot customize/override the
logrotate configuration.

Closes-Bug: #1553244
Change-Id: Ic9fdda9a273c9ccd90502f0acc7614d2c7157dca
This commit is contained in:
Éric Lemoine 2016-03-04 12:01:55 +01:00
parent 241913cc8f
commit 32a4cadac9
29 changed files with 176 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/defaults/main.yml
View File

@ -13,3 +13,7 @@ ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"
heka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heka"
heka_tag: "{{ openstack_release }}"
heka_image_full: "{{ heka_image }}:{{ heka_tag }}"
cron_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-cron"
cron_tag: "{{ openstack_release }}"
cron_image_full: "{{ cron_image }}:{{ cron_tag }}"

26
ansible/roles/common/tasks/config.yml
View File

@ -15,6 +15,8 @@
recurse: yes
with_items:
- "heka"
- "cron"
- "cron/logrotate"
- name: Copying over config.json files for services
template:
@ -22,6 +24,7 @@
dest: "{{ node_config_directory }}/{{ item }}/config.json"
with_items:
- "heka"
- "cron"
- name: Copying over heka config files
template:
@ -64,3 +67,26 @@
with_items:
- "elasticsearch"
when: "{{ enable_central_logging | bool }}"
- name: Copying over cron logrotate config files
template:
src: "cron-logrotate-{{ item }}.conf.j2"
dest: "{{ node_config_directory }}/cron/logrotate/{{ item }}.conf"
with_items:
- "ansible"
- "cinder"
- "glance"
- "global"
- "haproxy"
- "heat"
- "keepalived"
- "keystone"
- "magnum"
- "manila"
- "mariadb"
- "mistral"
- "murano"
- "neutron"
- "nova"
- "rabbitmq"
- "swift"

11
ansible/roles/common/tasks/start.yml
View File

@ -28,3 +28,14 @@
- "/dev/:/dev/"
- "/run/:/run/"
- "kolla_logs:/var/log/kolla/"
- name: Starting cron container
kolla_docker:
action: "start_container"
common_options: "{{ docker_common_options }}"
image: "{{ cron_image_full }}"
name: "cron"
volumes:
- "{{ node_config_directory }}/cron/:{{ container_config_directory }}/:ro"
- "heka_socket:/var/lib/kolla/heka/"
- "kolla_logs:/var/log/kolla/"

3
ansible/roles/common/templates/cron-logrotate-ansible.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/ansible.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-cinder.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/cinder/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-glance.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/glance/*.log"
{
}

21
ansible/roles/common/templates/cron-logrotate-global.conf.j2 Normal file
View File

@ -0,0 +1,21 @@
weekly
rotate 6
copytruncate
compress
delaycompress
notifempty
missingok
minsize 30M
maxsize 100M
su root kolla
include /etc/logrotate.d

3
ansible/roles/common/templates/cron-logrotate-haproxy.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/haproxy/haproxy.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-heat.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/heat/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-keepalived.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/haproxy/keepalived.log"
{
}

5
ansible/roles/common/templates/cron-logrotate-keystone.conf.j2 Normal file
View File

@ -0,0 +1,5 @@
{% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
"/var/log/kolla/keystone/*.log"
"/var/log/kolla/{{ apache_dir }}/keystone-apache-*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-magnum.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/magnum/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-manila.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/manila/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-mariadb.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/mariadb/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-mistral.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/mistral/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-murano.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/murano/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-neutron.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/neutron/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-nova.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/nova/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-rabbitmq.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/rabbitmq/*.log"
{
}

3
ansible/roles/common/templates/cron-logrotate-swift.conf.j2 Normal file
View File

@ -0,0 +1,3 @@
"/var/log/kolla/swift/*.log"
{
}

22
ansible/roles/common/templates/cron.json.j2 Normal file
View File

@ -0,0 +1,22 @@
{% set cron_cmd = 'cron -f' if kolla_base_distro in ['ubuntu', 'debian'] else 'crond -s -n' %}
{% set services = ["ansible", "cinder", "glance", "haproxy", "heat", "keepalived", "keystone", "magnum", "manila", "mariadb", "mistral", "murano", "neutron", "nova", "rabbitmq", "swift"] %}
{
"command": "{{ cron_cmd }}",
"config_files": [
{
"source": "{{ container_config_directory }}/logrotate/global.conf",
"dest": "/etc/logrotate.conf",
"owner": "root",
"perm": "0644"
},
{% for service in services %}
{
"source": "{{ container_config_directory }}/logrotate/{{ service }}.conf",
"dest": "/etc/logrotate.d/{{ service }}.conf",
"owner": "root",
"perm": "0644"
}{% if not loop.last %},{% endif %}
{% endfor %}
]
}

3
ansible/roles/common/templates/heka-keystone.toml.j2
View File

@ -9,5 +9,6 @@ filename = "lua_decoders/os_keystone_apache_log.lua"
type = "LogstreamerInput"
decoder = "keystone_apache_log_decoder"
log_directory = "/var/log/kolla"
file_match = '{{ apache_dir }}/keystone-apache-(?P<Service>.+)-access\.log'
file_match = '{{ apache_dir }}/keystone-apache-(?P<Service>.+)-access\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ["keystone-apache-", "Service"]

3
ansible/roles/common/templates/heka-mariadb.toml.j2
View File

@ -6,5 +6,6 @@ filename = "lua_decoders/os_mysql_log.lua"
type = "LogstreamerInput"
decoder = "mariadb_log_decoder"
log_directory = "/var/log/kolla"
file_match = 'mariadb/mariadb\.log'
file_match = 'mariadb/mariadb\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ['mariadb']

3
ansible/roles/common/templates/heka-openstack.toml.j2
View File

@ -6,5 +6,6 @@ filename = "lua_decoders/os_openstack_log.lua"
type = "LogstreamerInput"
decoder = "openstack_log_decoder"
log_directory = "/var/log/kolla"
file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila)/(?P<Program>.*)\.log'
file_match = '(?P<Service>nova|glance|keystone|neutron|cinder|heat|murano|magnum|mistral|manila)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ["Service", "_", "Program"]

3
ansible/roles/common/templates/heka-rabbitmq.toml.j2
View File

@ -13,5 +13,6 @@ type = "LogstreamerInput"
decoder = "rabbitmq_log_decoder"
splitter = "rabbitmq_log_splitter"
log_directory = "/var/log/kolla"
file_match = 'rabbitmq/(?P<Service>rabbit.*)\.log'
file_match = 'rabbitmq/(?P<Service>rabbit.*)\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ["Service"]

23
docker/cron/Dockerfile.j2 Normal file
View File

@ -0,0 +1,23 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
cronie \
logrotate \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
cron \
logrotate \
&& apt-get clean
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
{{ include_footer }}

7
docker/cron/extend_start.sh Normal file
View File

@ -0,0 +1,7 @@
#!/bin/bash
# NOTE(elemoine): the cron daemon sends its logs to /dev/log. Heka's log socket
# is at /var/lib/kolla/heka/log so we symlink /dev/log to that location.
if [[ ! -h /dev/log ]]; then
ln -sf /var/lib/kolla/heka/log /dev/log
fi

6
kolla/common/config.py
View File

@ -25,7 +25,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'mariadb', 'haproxy',
default=['ceph', 'cron', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'heka'],
help='Infra images'),
@ -39,13 +39,13 @@ _PROFILE_OPTS = [
'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper'],
help='Aux Images'),
cfg.ListOpt('default',
default=['kolla-toolbox', 'glance', 'haproxy',
default=['cron', 'kolla-toolbox', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'memcached', 'mariadb', 'neutron', 'nova',
'openvswitch', 'rabbitmq', 'heka'],
help='Default images'),
cfg.ListOpt('gate',
default=['glance', 'haproxy', 'keepalived', 'keystone',
default=['cron', 'glance', 'haproxy', 'keepalived', 'keystone',
'kolla-toolbox', 'mariadb', 'memcached', 'neutron',
'nova', 'openvswitch', 'rabbitmq', 'heka'],
help='Gate images'),

1
tools/cleanup-containers
View File

@ -14,6 +14,7 @@ else
bootstrap_{ceph_mon,cinder,glance,heat,heka,ironic,ironic_pxe,keystone,magnum,mistral,mongodb,murano,neutron,nova,nova_compute} \
cinder_{volume,scheduler,backup,api} \
ceph_{mon,rgw} \
cron \
elasticsearch \
glance_{api,registry} \
haproxy \