diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-19 16:44:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-19 16:44:44 +0000 |
| commit | 6d1efb092c654650eb2420058ea4d81e7ccc8e68 (patch) | |
| tree | 74de0fc10576bda792ce4e01f6740c11a90953ee | |
| parent | bfa8e408972a34d444e9e612f537fbf196d00603 (diff) | |
| parent | 2cb59e45a592056b01b2f3a401535738f87de35c (diff) | |
| download | kolla-6d1efb092c654650eb2420058ea4d81e7ccc8e68.tar.gz kolla-6d1efb092c654650eb2420058ea4d81e7ccc8e68.zip | |
Merge "Replace invisible unicode chars" into stable/zed
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | specs/logging-with-heka.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 97dca96e7..00bf3d2af 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -122,9 +122,9 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {%- if not loop.last %} \{% endif %} {% endfor -%} -{% for cmd in rpm_setup %} +{% for cmd in rpm_setup %} {{ cmd }} -{% endfor %} +{% endfor %} {% block base_centos_repo_overrides_post_rpm %}{% endblock %} diff --git a/specs/logging-with-heka.rst b/specs/logging-with-heka.rst index 8087a6a41..7b863db17 100644 --- a/specs/logging-with-heka.rst +++ b/specs/logging-with-heka.rst @@ -256,7 +256,7 @@ An alternative to this proposal involves using Logstash in a centralized way as done in [1]. Another alternative would be to execute Logstash on each cluster node, as this -spec proposes with Heka. But this would mean running a JVM on each cluster +spec proposes with Heka. But this would mean running a JVM on each cluster node, and using Redis as a centralized queue. Also, as described above, we initially considered relying on services writing |