openstack/openstack-ansible
Code Issues Proposed changes

Allow a log dir that isn't the "service_name"

Browse Source 
Galera logs by default to /var/log/mysql_logs these logs are being
ignored and not mounted properly on the host server, because the
service_name that is used to mount the log directory is "galera" and not
"mysql_logs".

This patch adds an option to set the log_directory specifically inside
the env.d yml files, but defaults to "service_name" when the
log_directory option isn't set. This will mean functionality remains
unchanged for all services.

Additionally, the log_directory has changed to "mysql_logs" for galera
containers, to resolve the galera log issue.

Change-Id: I18400248da455156dbba31b9c2ff254b58c51673
Closes-Bug: #1486955
This commit is contained in:
Andy McCrae 2015-08-20 12:14:35 +01:00
parent 61112a74f7
commit f77cc7a861
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/openstack_deploy/env.d/galera.yml
View File

@ -27,5 +27,6 @@ container_skel:
contains: contains:
- galera - galera
properties: properties:
log_directory: mysql_logs
service_name: galera service_name: galera
container_release: trusty container_release: trusty

4
playbooks/roles/lxc_container_create/tasks/container_create.yml
View File

@ -97,10 +97,10 @@
name: "{{ inventory_hostname }}" name: "{{ inventory_hostname }}"
container_command: | container_command: |
mkdir -p /var/backup mkdir -p /var/backup
mkdir -p /var/log/{{ properties.service_name }} mkdir -p /var/log/{{ properties.log_directory | default(properties.service_name) }}
container_config: container_config:
- "lxc.mount.entry=/openstack/backup/{{ inventory_hostname }} var/backup none defaults,bind,rw 0 0" - "lxc.mount.entry=/openstack/backup/{{ inventory_hostname }} var/backup none defaults,bind,rw 0 0"
- "lxc.mount.entry=/openstack/log/{{ inventory_hostname }} var/log/{{ properties.service_name }} none defaults,bind,rw 0 0" - "lxc.mount.entry=/openstack/log/{{ inventory_hostname }} var/log/{{ properties.log_directory | default(properties.service_name) }} none defaults,bind,rw 0 0"
- "lxc.aa_profile=lxc-openstack" - "lxc.aa_profile=lxc-openstack"
when: properties.service_name is defined when: properties.service_name is defined
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"