Skip to content
Snippets Groups Projects
Commit a28b2462 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Add cron image and playbook"

parents 4a5859bb 32a4cada
No related branches found
No related tags found
No related merge requests found
Showing
with 112 additions and 0 deletions
......@@ -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 }}"
......@@ -6,6 +6,8 @@
recurse: yes
with_items:
- "heka"
- "cron"
- "cron/logrotate"
- name: Copying over config.json files for services
template:
......@@ -13,6 +15,7 @@
dest: "{{ node_config_directory }}/{{ item }}/config.json"
with_items:
- "heka"
- "cron"
- name: Copying over heka config files
template:
......@@ -55,3 +58,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"
......@@ -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/"
"/var/log/kolla/ansible.log"
{
}
"/var/log/kolla/cinder/*.log"
{
}
"/var/log/kolla/glance/*.log"
{
}
weekly
rotate 6
copytruncate
compress
delaycompress
notifempty
missingok
minsize 30M
maxsize 100M
su root kolla
include /etc/logrotate.d
"/var/log/kolla/haproxy/haproxy.log"
{
}
"/var/log/kolla/heat/*.log"
{
}
"/var/log/kolla/haproxy/keepalived.log"
{
}
{% 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"
{
}
"/var/log/kolla/magnum/*.log"
{
}
"/var/log/kolla/manila/*.log"
{
}
"/var/log/kolla/mariadb/*.log"
{
}
"/var/log/kolla/mistral/*.log"
{
}
"/var/log/kolla/murano/*.log"
{
}
"/var/log/kolla/neutron/*.log"
{
}
"/var/log/kolla/nova/*.log"
{
}
"/var/log/kolla/rabbitmq/*.log"
{
}
"/var/log/kolla/swift/*.log"
{
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment