commit 44581caf5bc676ae98ea0438a5d9f4afdbe5bdf7
Author: Dan Prince <email address hidden>
Date: Sat Jun 8 08:56:03 2019 -0400
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)
Reviewed: https:/ /review. opendev. org/677430 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=44581caf5bc 676ae98ea0438a5 d9f4afdbe5bdf7
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 44581caf5bc676a e98ea0438a5d9f4 afdbe5bdf7
Author: Dan Prince <email address hidden>
Date: Sat Jun 8 08:56:03 2019 -0400
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 services/ keystone. yaml is used in Rocky and services/ keystone. yaml.
cleanly, as docker/
earlier, while Stein and later use puppet/
Conflicts:
puppet/ services/ keystone. yaml
Change-Id: Ib179e3bbc827cc 438519b19e85bda 4a9994376b9 7287301c8c844b5 4d2c310bc7) 920aa6749b22e83 8736d600f0)
Closes-bug: #1832090
(cherry picked from commit 8eaac3026e54a05
(cherry picked from commit 1c7b5ff95f0c6f2