openstack/kolla-ansible
Code Issues Proposed changes

Fix ceph log location

Browse Source 
There are to parameter for ceph-mon/ceph-osd/radosgw, "-f" and "-d".

    -d run in foreground, log to stderr.
    -f run in foreground, log to usual location.

When log tin stderr, docker engine will collect the logs. It is useless
and we should write the log into file only. Then stop writing log to
stderr.

ceph-mon log location is controlled by "mon cluster log file".

Change-Id: I7883a4316420bc2bf4c772cb7248b663359f54b7
Closes-Bug: #1677237
This commit is contained in:
Jeffrey Zhang
2017-03-29 21:33:31 +08:00
parent 8253e4af49
commit 2947a95c29
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/ceph/templates/ceph-mon.json.j2
View File

@@ -1,8 +1,8 @@
{
{%- if orchestration_engine == 'KUBERNETES' %}
"command": "/usr/bin/ceph-mon -d -i @MONID@ --public-addr @MONADDR@:6789",
"command": "/usr/bin/ceph-mon -f -i @MONID@ --public-addr @MONADDR@:6789",
{%- else %}
"command": "/usr/bin/ceph-mon -d -i {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
"command": "/usr/bin/ceph-mon -f -i {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }}:6789",
{%- endif %}
"config_files": [
{

4
ansible/roles/ceph/templates/ceph-osd.json.j2
View File

@@ -1,8 +1,8 @@
{
{%- if orchestration_engine == 'KUBERNETES' %}
"command": "/usr/bin/ceph-osd -f -d --public-addr @HOSTADDR@ --cluster-addr @CLUSTERADDR@",
"command": "/usr/bin/ceph-osd -f --public-addr @HOSTADDR@ --cluster-addr @CLUSTERADDR@",
{%- else %}
"command": "/usr/bin/ceph-osd -f -d --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --cluster-addr {{ hostvars[inventory_hostname]['ansible_' + cluster_interface]['ipv4']['address'] }}",
"command": "/usr/bin/ceph-osd -f --public-addr {{ hostvars[inventory_hostname]['ansible_' + storage_interface]['ipv4']['address'] }} --cluster-addr {{ hostvars[inventory_hostname]['ansible_' + cluster_interface]['ipv4']['address'] }}",
{%- endif %}
"config_files": [
{

2
ansible/roles/ceph/templates/ceph-rgw.json.j2
View File

@@ -1,5 +1,5 @@
{
"command": "/usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway -d",
"command": "/usr/bin/radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway -f",
"config_files": [
{
"source": "{{ container_config_directory }}/ceph.conf",

7
ansible/roles/ceph/templates/ceph.conf.j2
View File

@@ -1,7 +1,9 @@
[global]
log file = /var/log/kolla/ceph/$cluster-$name.log
log to syslog = true
err to syslog = true
log to syslog = false
err to syslog = false
log to stderr = false
err to stderr = false
fsid = {{ ceph_cluster_fsid }}
{% if orchestration_engine != 'KUBERNETES' %}
@@ -26,6 +28,7 @@ setuser match path = /var/lib/ceph/$type/$cluster-$id
# NOTE(SamYaple): The monitor files have been known to grow very large. The
# only fix for that is to compact the files.
mon compact on start = true
mon cluster log file = /var/log/kolla/ceph/$cluster.log
{% if service_name is defined and service_name == 'ceph-rgw' %}
[client.radosgw.gateway]