From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 7 May 2020 08:22:57 +0000 (+0800)
Subject: ceph: remove ceph user and disable systemd services
X-Git-Tag: bronze-rc0~27
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a68e816a2c6175d77dfd75e505090c8eac480651;p=pti%2Frtp.git

ceph: remove ceph user and disable systemd services

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.

Issue-ID: INF-92
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I6613f6f9c4678da897ffee3faae0ce1929bb87e5
---

diff --git a/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg b/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
index bae15ec4..e08d8fe1 100644
--- a/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
+++ b/meta-stx/conf/distro/files/ks/poky_stx_aio_ks.cfg
@@ -616,10 +616,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
diff --git a/meta-stx/conf/distro/poky-stx.conf b/meta-stx/conf/distro/poky-stx.conf
index c338078c..0c099859 100644
--- a/meta-stx/conf/distro/poky-stx.conf
+++ b/meta-stx/conf/distro/poky-stx.conf
@@ -56,9 +56,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; \
diff --git a/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb b/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
index 96b70765..8c6b0766 100644
--- a/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
+++ b/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
@@ -82,6 +82,7 @@ SYSTEMD_SERVICE_${PN} = " \
     ceph-mgr.target \
     rbdmap.service \
 "
+SYSTEMD_AUTO_ENABLE = "disable"
 
 OECMAKE_GENERATOR = "Unix Makefiles"