starlingx/integ
Code Issues Proposed changes

Merge "Change ceph-mon configuration"

Browse Source
This commit is contained in:
Zuul 2021-10-27 20:23:44 +00:00 committed by Gerrit Code Review
commit fed65b55e8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/ceph/centos/ceph.spec
View File

@ -596,6 +596,7 @@ Requires: util-linux
Requires: xfsprogs Requires: xfsprogs
Requires: which Requires: which
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Requires: gdisk
# The following is necessary due to tracker 36508 and can be removed once the # The following is necessary due to tracker 36508 and can be removed once the
# associated upstream bugs are resolved. # associated upstream bugs are resolved.
%if 0%{with tcmalloc} %if 0%{with tcmalloc}
@ -1468,7 +1469,6 @@ CMAKE=cmake3
%else %else
CMAKE=cmake CMAKE=cmake
%endif %endif
${CMAKE} .. \ ${CMAKE} .. \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \

3
ceph/ceph/files/ceph.conf
View File

@ -56,3 +56,6 @@
mon pg warn max per osd = 2048 mon pg warn max per osd = 2048
mon pg warn max object skew = 0 mon pg warn max object skew = 0
mgr initial modules = restful mgr initial modules = restful
mon warn on insecure global id reclaim = false
mon warn on insecure global id reclaim allowed = false
auth allow insecure global id reclaim = true