diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-08-19 10:30:58 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-08-19 10:30:58 +0200 |
| commit | 07b55048e63f27c1045735624c845d1af95a11fd (patch) | |
| tree | f4bee09b3746f6470259273fc59cc0651389a0cd | |
| parent | 0ffd3aefda90fd7206f4b0989ff17ace414423fe (diff) | |
| download | kolla-07b55048e63f27c1045735624c845d1af95a11fd.tar.gz kolla-07b55048e63f27c1045735624c845d1af95a11fd.zip | |
Unbreak CI: fluentd and TripleO dependency
fluentd - we are not deploying kubernetes, no need for plugins
TripleO - CI currently broken (to reverse, FIXME in place)
Change-Id: I203f70176af7f2b53398ddeb5c21e6234a45e268
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
| -rw-r--r-- | .zuul.d/centos.yaml | 6 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 97a636c53..7cd7d15ee 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -8,7 +8,8 @@ - kolla-ansible-centos-binary - kolla-ansible-centos-source-upgrade - tripleo-build-containers-centos-7: - voting: true + # FIXME(yoctozepto): set to voting when TripleO CI is fixed + voting: false files: - ^.zuul.d/centos.yaml$ - ^docker/.*$ @@ -34,7 +35,8 @@ jobs: - kolla-build-centos-source - tripleo-build-containers-centos-7: - voting: true + # FIXME(yoctozepto): set to voting when TripleO CI is fixed + voting: false files: - ^.zuul.d/centos.yaml$ - ^docker/.*$ diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 0f5c6f95c..3f6bd7056 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ruby-devel', 'rubygem-fluent-plugin-elasticsearch', 'rubygem-fluent-plugin-grok-parser', - 'rubygem-fluent-plugin-kubernetes_metadata_filter', 'rubygem-fluent-plugin-rewrite-tag-filter', 'rubygem-fluent-plugin-secure-forward' ] %} @@ -83,7 +82,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start 'fluent-plugin-elasticsearch', 'fluent-plugin-grep', 'fluent-plugin-grok-parser:2.1.4', - 'fluent-plugin-kubernetes_metadata_filter', 'fluent-plugin-parser', 'fluent-plugin-rewrite-tag-filter:2.0.0', 'fluent-plugin-secure-forward', |