diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index cc33602ef5..98a6d8ab50 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/.*$ @@ -24,15 +25,6 @@ queue: kolla jobs: - kolla-build-centos-source - - tripleo-build-containers-centos-7: - voting: true - files: - - ^.zuul.d/centos.yaml$ - - ^docker/.*$ - - ^kolla/.*$ - - ^requirements.txt$ - - ^setup.cfg$ - - ^setup.py$ periodic: jobs: - kolla-publish-centos-source diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 814e2bd368..e4662ca8c1 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' ] %} @@ -65,7 +64,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',