starlingx/meta-starlingx
Code Issues Proposed changes

ceph: remove ceph user and disable systemd services

Browse Source 
In stx 3.0, ceph runs with root user and is not meant to
be managed by systemd, so remove ceph user group, and
disable systemd services by default.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Jackie Huang 2020-05-07 16:22:57 +08:00 committed by Babak Sarashki
parent 7511ca1805
commit 1bdadaaafb
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-stx-distro/conf/distro/files/ks/poky_stx_aio_ks.cfg
View File

@ -626,10 +626,6 @@ useradd -m -g sys_protected -G root -d /home/sysadmin -p ${SYSADMIN_P} -s /bin/s
groupadd -r -g 128 nscd
useradd -M -o -r -d / -s /sbin/nologin -c 'NSCD Daemon' -u 28 -g nscd nscd
useradd -p '' ceph
groupadd ceph
usermod -a -G ceph ceph
useradd -p '' patching
groupadd patching
usermod -a -G patching patching

3
meta-stx-distro/conf/distro/poky-stx.conf
View File

@ -40,9 +40,6 @@ EXTRA_USERS_PARAMS_CONFIG = "\
useradd -m -g sys_protected -G root \
-d /home/sysadmin -p ${SYSADMIN_P} \
-s /bin/sh sysadmin; \
useradd -p '' ceph; \
groupadd ceph; \
usermod -a -G ceph ceph; \
useradd -p '' haproxy; \
groupadd haproxy; \
usermod -a -G haproxy haproxy; \

1
meta-stx-virt/recipes-extended/ceph/ceph_13.2.2.bb
View File

@ -67,6 +67,7 @@ SYSTEMD_SERVICE_${PN} = " \
ceph-mgr.target \
rbdmap.service \
"
SYSTEMD_AUTO_ENABLE = "disable"
OECMAKE_GENERATOR = "Unix Makefiles"