From f4a3563bc3e599f54281d6b3d20feb406e0a6920 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.

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

diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 93e324e07e..958420279b 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -687,7 +687,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"