openstack/kolla-ansible
Code Issues Proposed changes

Merge "Rework heka log copying"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 12:39:35 +00:00 committed by Gerrit Code Review
commit 4d37a8a33f
2 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,45 +19,32 @@
- name: Copying over heka config files - name: Copying over heka config files
template: template:
src: "heka-{{ item }}.toml.j2" src: "heka-{{ item.src|default(item.name) }}.toml.j2"
dest: "{{ node_config_directory }}/heka/heka-{{ item }}.toml" dest: "{{ node_config_directory }}/heka/heka-{{ item.name }}.toml"
when: item.enabled | bool
with_items: with_items:
- "global" - { name: "elasticsearch", enabled: "{{ enable_central_logging }}" }
- "haproxy" - { name: "global", enabled: "yes" }
- "rabbitmq" - { name: "haproxy", enabled: "{{ enable_haproxy }}" }
- "openstack" - { name: "keystone", enabled: "{{ enable_keystone }}" }
- "mariadb" - { name: "mariadb", enabled: "{{ enable_rabbitmq }}" }
- "keystone" - { name: "openstack", enabled: "yes" }
- "elasticsearch" - { name: "rabbitmq", enabled: "{{ enable_rabbitmq }}" }
- { name: "swift-account-auditor", src: "swift", enabled: "{{ enable_swift }}" }
- name: Copying over heka swift config files - { name: "swift-account-reaper", src: "swift", enabled: "{{ enable_swift }}" }
template: - { name: "swift-account-replicator", src: "swift", enabled: "{{ enable_swift }}" }
src: "heka-swift.toml.j2" - { name: "swift-account-server", src: "swift", enabled: "{{ enable_swift }}" }
dest: "{{ node_config_directory }}/heka/heka-{{ item }}.toml" - { name: "swift-container-auditor", src: "swift", enabled: "{{ enable_swift }}" }
with_items: - { name: "swift-container-replicator", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-account-auditor" - { name: "swift-container-server", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-account-reaper" - { name: "swift-container-updater", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-account-replicator" - { name: "swift-object-auditor", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-account-server" - { name: "swift-object-expirer", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-container-auditor" - { name: "swift-object-replicator", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-container-replicator" - { name: "swift-object-server", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-container-server" - { name: "swift-object-updater", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-container-updater" - { name: "swift-proxy-server", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-object-auditor" - { name: "swift-rsyncd", src: "swift", enabled: "{{ enable_swift }}" }
- "swift-object-expirer"
- "swift-object-replicator"
- "swift-object-server"
- "swift-object-updater"
- "swift-proxy-server"
- "swift-rsyncd"
- name: Copying over heka elasticsearch config file
template:
src: "heka-{{ item }}.toml.j2"
dest: "{{ node_config_directory }}/heka/heka-{{ item }}.toml"
with_items:
- "elasticsearch"
when: "{{ enable_central_logging | bool }}"
- name: Copying over cron logrotate config files - name: Copying over cron logrotate config files
template: template:

3
ansible/roles/common/templates/heka.json.j2
View File

@ -50,7 +50,8 @@
"source": "{{ container_config_directory }}/heka-{{ swift_service }}.toml", "source": "{{ container_config_directory }}/heka-{{ swift_service }}.toml",
"dest": "/etc/heka/heka-{{ swift_service }}.toml", "dest": "/etc/heka/heka-{{ swift_service }}.toml",
"owner": "heka", "owner": "heka",
"perm": "0600" "perm": "0600",
"optional": "True"
}{% if not loop.last %},{% endif %} }{% if not loop.last %},{% endif %}
{% endfor %} {% endfor %}