From 44581caf5bc676ae98ea0438a5d9f4afdbe5bdf7 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Sat, 8 Jun 2019 08:56:03 -0400
Subject: [PATCH] keystone: drop duplicate -DFOREGROUND

No need to specify this as kolla adds this arg automatically
when using kolla_start.

Note that the commit this was cherry picked from does not apply
cleanly, as docker/services/keystone.yaml is used in Rocky and
earlier, while Stein and later use puppet/services/keystone.yaml.

Conflicts:
       puppet/services/keystone.yaml

Change-Id: Ib179e3bbc827cc438519b19e85bda4a9994376b9
Closes-bug: #1832090
(cherry picked from commit 8eaac3026e54a057287301c8c844b54d2c310bc7)
(cherry picked from commit 1c7b5ff95f0c6f2920aa6749b22e838736d600f0)
---
 docker/services/keystone.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index fe3ffb0114..0c12bedd81 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -101,7 +101,7 @@ outputs:
         config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/keystone.json:
-          command: /usr/sbin/httpd -DFOREGROUND
+          command: /usr/sbin/httpd
           config_files:
             - source: "/var/lib/kolla/config_files/src/etc/keystone/fernet-keys"
               dest: "/etc/keystone/fernet-keys"