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 8eaac3026e
)
This commit is contained in:
parent
b7310c8216
commit
1c7b5ff95f
|
@ -117,7 +117,7 @@ outputs:
|
||||||
config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
|
config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/keystone.json:
|
/var/lib/kolla/config_files/keystone.json:
|
||||||
command: /usr/sbin/httpd -DFOREGROUND
|
command: /usr/sbin/httpd
|
||||||
config_files:
|
config_files:
|
||||||
- source: "/var/lib/kolla/config_files/src/etc/keystone/fernet-keys"
|
- source: "/var/lib/kolla/config_files/src/etc/keystone/fernet-keys"
|
||||||
dest: "/etc/keystone/fernet-keys"
|
dest: "/etc/keystone/fernet-keys"
|
||||||
|
|
Loading…
Reference in New Issue