debian: Remove keystone group and user

Remove the keystone group and user since its created
when the keystone package is installed and the image is built.

Tested by checking that the keystone user/group was still
on the image after they were removed from base-passwd.

Story: 2009221
Task: 43417

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I404d8d17cfc901c4cb2fed3b79a05c440c063641

base/base-passwd/debian/patches/0001-Change-group-passwd.patch

@@ -1,9 +1,9 @@
-From 1d06f74733c8728fc1f0cb21f519ae84beb03b67 Mon Sep 17 00:00:00 2001
+From c88fd4f11479590bbbb35f5ba87fb64112bd2e2c Mon Sep 17 00:00:00 2001
 From: Al Bailey <Al.Bailey@windriver.com>
 Date: Thu, 24 Oct 2019 11:53:01 -0500
 Subject: [PATCH] Change group,passwd
 
-Porthing this patch from 'setup' package of CentOS. Removing the
+Porting this patch from 'setup' package of CentOS. Removing the
 change of uidgid, because no such file in base-passwd, and Debian
 system. The file is installed into /usr/share/doc/setup-2.8.71/uidgid
 in CentOS, which is just a doc file, so ignore it.
@@ -11,13 +11,14 @@ in CentOS, which is just a doc file, so ignore it.
 Signed-off-by: Andy Ning <andy.ning@windriver.com>
 Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
 Signed-off-by: Yue Tao <yue.tao@windriver.com>
+Signed-off-by: Charles Short <charles.short@windriver.com>
 ---
- group.master  | 19 ++++++++++++-------
- passwd.master | 16 +++++++++++-----
- 2 files changed, 23 insertions(+), 12 deletions(-)
+ group.master  | 18 +++++++++++-------
+ passwd.master | 15 ++++++++++-----
+ 2 files changed, 21 insertions(+), 12 deletions(-)
 
 diff --git a/group.master b/group.master
-index ad1dd2d..748ca76 100644
+index ad1dd2d..be763b3 100644
 --- a/group.master
 +++ b/group.master
 @@ -1,15 +1,11 @@
@@ -44,7 +45,7 @@ index ad1dd2d..748ca76 100644
  dip:*:30:
  www-data:*:33:
  backup:*:34:
-@@ -30,10 +25,20 @@ src:*:40:
+@@ -30,10 +25,19 @@ src:*:40:
  gnats:*:41:
  shadow:*:42:
  utmp:*:43:
@@ -58,7 +59,6 @@ index ad1dd2d..748ca76 100644
 +postgres:x:120:
 +nova:x:162:nova
 +barbican:x:978:barbican
-+keystone:x:42424:keystone
 +neutron:x:164:neutron
 +ceilometer:x:166:ceilometer
 +sysinv:x:168:sysinv
@@ -68,7 +68,7 @@ index ad1dd2d..748ca76 100644
 +ironic:x:1874:ironic
 +www:x:1877:www
 diff --git a/passwd.master b/passwd.master
-index f1e69a4..18f5e05 100644
+index f1e69a4..1033a78 100644
 --- a/passwd.master
 +++ b/passwd.master
 @@ -1,12 +1,7 @@
@@ -84,7 +84,7 @@ index f1e69a4..18f5e05 100644
  news:*:9:9:news:/var/spool/news:/usr/sbin/nologin
  uucp:*:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
  proxy:*:13:13:proxy:/bin:/usr/sbin/nologin
-@@ -16,3 +11,14 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
+@@ -16,3 +11,13 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
  irc:*:39:39:ircd:/run/ircd:/usr/sbin/nologin
  gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
  nobody:*:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
@@ -95,10 +95,9 @@ index f1e69a4..18f5e05 100644
 +fm:x:195:195:fm-mgr:/var/lib/fm:/sbin/nologin
 +barbican:x:982:978:Barbican Key Manager user account.:/var/lib/barbican:/sbin/nologin
 +ceilometer:x:991:166:OpenStack ceilometer Daemons:/var/lib/ceilometer:/sbin/nologin
-+keystone:x:42424:42424:OpenStack Keystone Daemons:/var/lib/keystone:/sbin/nologin
 +nova:x:994:162:OpenStack Nova Daemons:/var/lib/nova:/sbin/nologin
 +ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin
 +www:x:1877:1877:www:/home/www:/sbin/nologin
 -- 
-2.25.1
+2.30.2