diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-19 13:18:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-19 13:18:54 +0000 |
| commit | 6320b05f71fdb2af52e697b9938a29385f65a443 (patch) | |
| tree | 9315219318b48aed26945c25bf04dfcce90b60c5 | |
| parent | 1e95081f06897a20b1496d70282cf5c96e1b8263 (diff) | |
| parent | 07b55048e63f27c1045735624c845d1af95a11fd (diff) | |
| download | kolla-6320b05f71fdb2af52e697b9938a29385f65a443.tar.gz kolla-6320b05f71fdb2af52e697b9938a29385f65a443.zip | |
Merge "Unbreak CI: fluentd and TripleO dependency"
| -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', |