diff --git a/ansible/roles/ceph/templates/ceph-mon.json.j2 b/ansible/roles/ceph/templates/ceph-mon.json.j2 index c1cc964547..11dfccf6e3 100644 --- a/ansible/roles/ceph/templates/ceph-mon.json.j2 +++ b/ansible/roles/ceph/templates/ceph-mon.json.j2 @@ -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": [ { diff --git a/ansible/roles/ceph/templates/ceph-osd.json.j2 b/ansible/roles/ceph/templates/ceph-osd.json.j2 index f6d62e8923..7118f1b160 100644 --- a/ansible/roles/ceph/templates/ceph-osd.json.j2 +++ b/ansible/roles/ceph/templates/ceph-osd.json.j2 @@ -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": [ { diff --git a/ansible/roles/ceph/templates/ceph-rgw.json.j2 b/ansible/roles/ceph/templates/ceph-rgw.json.j2 index 7cb0ccdd44..9789651da5 100644 --- a/ansible/roles/ceph/templates/ceph-rgw.json.j2 +++ b/ansible/roles/ceph/templates/ceph-rgw.json.j2 @@ -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", diff --git a/ansible/roles/ceph/templates/ceph.conf.j2 b/ansible/roles/ceph/templates/ceph.conf.j2 index 2a0e79aaa1..d355f6c09e 100644 --- a/ansible/roles/ceph/templates/ceph.conf.j2 +++ b/ansible/roles/ceph/templates/ceph.conf.j2 @@ -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]